Correct CMake version check; VERSION_GREATER 3.18 is true for 3.18.1

Added a changelog entry for the lightweight_test.hpp change.
Refs https://github.com/boostorg/core/pull/205.
2026-05-07 00:46:44 +02:00 · 2025-10-20 02:10:33 +03:00 · 2025-10-19 22:14:36 +03:00 · 2025-10-19 22:08:39 +03:00 · 2025-10-19 21:56:04 +03:00 · 2025-10-19 21:56:04 +03:00
26 changed files with 359 additions and 106 deletions
@@ -34,7 +34,6 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
                'set -e',
                'uname -a',
                'echo $DRONE_STAGE_MACHINE',
-                'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
            ] +
            (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
            (if packages != "" then [ 'apt-get update', 'apt-get -y install ' + packages ] else []) +
@@ -235,6 +234,13 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
        "g++-14-multilib",
    ),

+    linux_pipeline(
+        "Linux 25.04 GCC 15 32/64",
+        "cppalliance/droneubuntu2504:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-15', CXXSTD: '03,11,14,17,20,23,2c', ADDRMD: '32,64' },
+        "g++-15-multilib",
+    ),
+
    linux_pipeline(
        "Linux 16.04 Clang 3.5",
        "cppalliance/droneubuntu1604:1",
@@ -369,26 +375,33 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
    ),

    linux_pipeline(
-        "Linux 24.04 Clang 18 UBSAN",
+        "Linux 24.04 Clang 18",
        "cppalliance/droneubuntu2404:1",
-        { TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '03,11,14,17,20,2b' } + ubsan,
+        { TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '03,11,14,17,20,2b' },
        "clang-18",
    ),

    linux_pipeline(
-        "Linux 24.04 Clang 18 ASAN",
+        "Linux 24.04 Clang 19 UBSAN",
        "cppalliance/droneubuntu2404:1",
-        { TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '03,11,14,17,20,2b' } + asan,
-        "clang-18",
-    ),
-
-    linux_pipeline(
-        "Linux 24.10 Clang 19",
-        "cppalliance/droneubuntu2410:1",
-        { TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '03,11,14,17,20,2b' },
+        { TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '03,11,14,17,20,2b' } + ubsan,
        "clang-19",
    ),

+    linux_pipeline(
+        "Linux 24.04 Clang 19 ASAN",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-19', CXXSTD: '03,11,14,17,20,2b' } + asan,
+        "clang-19",
+    ),
+
+    linux_pipeline(
+        "Linux 25.04 Clang 20",
+        "cppalliance/droneubuntu2504:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-20', CXXSTD: '03,11,14,17,20,23,2c' },
+        "clang-20",
+    ),
+
    macos_pipeline(
        "MacOS 10.15 Xcode 12.2 UBSAN",
        { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' } + ubsan,
@@ -1,5 +1,5 @@
 # Copyright 2020-2021 Peter Dimov
-# Copyright 2021-2024 Andrey Semashev
+# Copyright 2021-2025 Andrey Semashev
 #
 # 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)
@@ -100,13 +100,13 @@ jobs:
          - toolset: gcc-9
            cxxstd: "03,11,14,17,2a"
            address-model: 32,64
-            os: ubuntu-20.04
+            os: ubuntu-24.04
            install:
              - g++-9-multilib
          - toolset: gcc-10
            cxxstd: "03,11,14,17,20"
            address-model: 32,64
-            os: ubuntu-20.04
+            os: ubuntu-24.04
            install:
              - g++-10-multilib
          - toolset: gcc-11
@@ -135,6 +135,13 @@ jobs:
            container: ubuntu:24.04
            install:
              - g++-14-multilib
+          - toolset: gcc-15
+            cxxstd: "03,11,14,17,20,23,2c"
+            address-model: 32,64
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install:
+              - g++-15-multilib
          - name: UBSAN
            toolset: gcc-12
            cxxstd: "03,11,14,17,20,23"
@@ -220,13 +227,15 @@ jobs:
          - toolset: clang
            compiler: clang++-9
            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
            install:
              - clang-9
          - toolset: clang
            compiler: clang++-10
            cxxstd: "03,11,14,17,20"
-            os: ubuntu-20.04
+            os: ubuntu-latest
+            container: ubuntu:20.04
            install:
              - clang-10
          - toolset: clang
@@ -316,13 +325,24 @@ jobs:
            compiler: clang++-19
            cxxstd: "03,11,14,17,20,2b"
            os: ubuntu-latest
-            container: ubuntu:24.10
+            container: ubuntu:24.04
            install:
              - clang-19
              - libc++-19-dev
              - libc++abi-19-dev
            cxxflags: -stdlib=libc++
            linkflags: -stdlib=libc++
+          - toolset: clang
+            compiler: clang++-20
+            cxxstd: "03,11,14,17,20,2b,2c"
+            os: ubuntu-latest
+            container: ubuntu:25.04
+            install:
+              - clang-20
+              - libc++-20-dev
+              - libc++abi-20-dev
+            cxxflags: -stdlib=libc++
+            linkflags: -stdlib=libc++
          - name: UBSAN
            toolset: clang
            compiler: clang++-15
@@ -336,6 +356,14 @@ jobs:
              - libc++-15-dev
              - libc++abi-15-dev

+          - name: ARM
+            toolset: gcc-13
+            cxxstd: "03-gnu,11-gnu,14-gnu,17-gnu,20-gnu,23-gnu"
+            os: ubuntu-24.04-arm
+            container: ubuntu:24.04
+            install:
+              - g++-13
+
          - toolset: clang
            cxxstd: "03,11,14,17,20,2b"
            os: macos-13
@@ -363,6 +391,22 @@ jobs:
                echo "GHA_CONTAINER=${{matrix.container}}" >> $GITHUB_ENV
                if [ -f "/etc/debian_version" ]
                then
+                    # Use Azure APT mirrors in containers to avoid HTTP errors due to DDoS filters triggered by lots of CI jobs launching concurrently.
+                    # Note that not all Ubuntu versions support "mirror+file:..." URIs in APT sources, so just use Azure mirrors exclusively.
+                    # Note also that on recent Ubuntu versions DEB822 format is used for source files.
+                    APT_SOURCES=()
+                    if [ -d "/etc/apt/sources.list.d" ]
+                    then
+                        readarray -t APT_SOURCES < <(find "/etc/apt/sources.list.d" -type f -name '*.sources' -print)
+                    fi
+                    if [ -f "/etc/apt/sources.list" ]
+                    then
+                        APT_SOURCES+=("/etc/apt/sources.list")
+                    fi
+                    if [ "${#APT_SOURCES[@]}" -gt 0 ]
+                    then
+                        sed -i -E -e 's!([^ ]+) (http|https)://(archive|security)\.ubuntu\.com/ubuntu[^ ]*(.*)!\1 http://azure.archive.ubuntu.com/ubuntu/\4!' "${APT_SOURCES[@]}"
+                    fi
                    apt-get -o Acquire::Retries=$NET_RETRY_COUNT update
                    if [ "$(apt-cache search "^python-is-python3$" | wc -l)" -ne 0 ]
                    then
@@ -563,14 +607,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - toolset: msvc-14.0
-            cxxstd: "14"
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.2
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2019
          - toolset: msvc-14.3
            cxxstd: "14,17,20,latest"
            addrmd: 32,64
@@ -582,7 +618,14 @@ jobs:
          - toolset: gcc
            cxxstd: "03,11,14,17,2a"
            addrmd: 64
-            os: windows-2019
+            os: windows-2022
+
+          # Windows SDK 32-bit ARM libs not installed in this image
+          - name: ARM
+            toolset: msvc-14.3
+            cxxstd: "14,17,20,latest"
+            addrmd: 64
+            os: windows-11-arm

    runs-on: ${{matrix.os}}
    timeout-minutes: 45
@@ -635,7 +678,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
          - os: ubuntu-24.04
          - os: macos-13
@@ -703,7 +745,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
          - os: ubuntu-24.04
          - os: macos-13
@@ -781,7 +822,6 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: ubuntu-20.04
          - os: ubuntu-22.04
          - os: ubuntu-24.04
          - os: macos-13
@@ -863,8 +903,8 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
          - os: windows-2022
+          - os: windows-2025

    runs-on: ${{matrix.os}}
    timeout-minutes: 10
@@ -925,8 +965,8 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
          - os: windows-2022
+          - os: windows-2025

    runs-on: ${{matrix.os}}
    timeout-minutes: 10
@@ -1005,8 +1045,8 @@ jobs:
      fail-fast: false
      matrix:
        include:
-          - os: windows-2019
          - os: windows-2022
+          - os: windows-2025

    runs-on: ${{matrix.os}}
    timeout-minutes: 20
@@ -20,7 +20,7 @@ target_link_libraries(boost_core
    Boost::throw_exception
 )

-if(CMAKE_VERSION VERSION_GREATER 3.18 AND CMAKE_GENERATOR MATCHES "Visual Studio")
+if(NOT CMAKE_VERSION VERSION_LESS 3.19 AND CMAKE_GENERATOR MATCHES "Visual Studio")

  file(GLOB_RECURSE boost_core_IDEFILES CONFIGURE_DEPENDS include/*.hpp)
  source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_core_IDEFILES} PREFIX "Header Files")
@@ -12,8 +12,8 @@ The criteria for inclusion is that the utility component be:

 Branch   | GitHub Actions | AppVeyor | Test Matrix | Dependencies |
 ---------|----------------|--------- | ----------- | ------------ |
-Develop  | [![GitHub Actions](https://github.com/boostorg/core/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/filesystem/actions?query=branch%3Adevelop) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/boostorg/core?branch=develop&svg=true)](https://ci.appveyor.com/project/pdimov/core) | [![Tests](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](http://www.boost.org/development/tests/develop/developer/core.html) | [![Dependencies](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/core.html)
-Master   | [![GitHub Actions](https://github.com/boostorg/core/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/filesystem/actions?query=branch%3Amaster) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/boostorg/core?branch=master&svg=true)](https://ci.appveyor.com/project/pdimov/core) | [![Tests](https://img.shields.io/badge/matrix-master-brightgreen.svg)](http://www.boost.org/development/tests/master/developer/core.html) | [![Dependencies](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/core.html)
+Develop  | [![GitHub Actions](https://github.com/boostorg/core/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/filesystem/actions?query=branch%3Adevelop) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/boostorg/core?branch=develop&svg=true)](https://ci.appveyor.com/project/pdimov/core) | [![Tests](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://regression.boost.io/develop/developer/core.html) | [![Dependencies](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/core.html)
+Master   | [![GitHub Actions](https://github.com/boostorg/core/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/filesystem/actions?query=branch%3Amaster) | [![AppVeyor](https://ci.appveyor.com/api/projects/status/github/boostorg/core?branch=master&svg=true)](https://ci.appveyor.com/project/pdimov/core) | [![Tests](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://regression.boost.io/master/developer/core.html) | [![Dependencies](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/core.html)

 ### Directories

@@ -1,12 +1,32 @@
 [/
  Copyright 2021 Peter Dimov
-  Copyright 2022-2024 Andrey Semashev
+  Copyright 2022-2025 Andrey Semashev
  Distributed under the Boost Software License, Version 1.0.
  https://boost.org/LICENSE_1_0.txt)
 ]

 [section Revision History]

+[section Changes in 1.90.0]
+
+* The implementation of `BOOST_TEST_THROWS` and `BOOST_TEST_NO_THROW` macros defined in
+  [link core.lightweight_test `boost/core/lightweight_test.hpp`] has been changed to avoid
+  compiler warnings on some compilers, when the macros are used in `if`/`else` blocks. As
+  a side effect of this change, the semicolon after the macro is now necessary. ([github_pr 205])
+* [link core.data `boost::data`] and [link core.size `boost::size`] are now aliases for `std::data`
+  and `std::size`, respectively, when the latter are provided by compiler. This resolves potential
+  ambiguities when both `boost::` and `std::` alternatives are found by the compiler, e.g. as a result
+  of ADL. ([github_issue 206])
+
+[endsect]
+
+[section Changes in 1.89.0]
+
+* Fixed `bit_ceil` to return 1 for input 0 as per specification. ([github_pr 199])
+* Added support for `std::format` to `boost::core::string_view`. ([github_issue 190])
+
+[endsect]
+
 [section Changes in 1.86.0]

 * Added a [link core.pointer_in_range `boost/core/pointer_in_range.hpp`] header with a `pointer_in_range`
@@ -38,7 +38,7 @@ and return type use spans.

 ```
 auto sha1(boost::span<const unsigned char> input,
-    boost::span<unsigned char, SHA_DIGEST_LENGTH> ouput)
+    boost::span<unsigned char, SHA_DIGEST_LENGTH> output)
 {
    SHA_CTX context;
    SHA1_Init(&context);
@@ -28,7 +28,7 @@
 # pragma intrinsic(_BitScanForward)
 # pragma intrinsic(_BitScanReverse)

-# if defined(_M_X64)
+# if defined(_M_X64) || defined(_M_ARM64)
 #  pragma intrinsic(_BitScanForward64)
 #  pragma intrinsic(_BitScanReverse64)
 # endif
@@ -230,7 +230,7 @@ inline int countl_impl( boost::uint16_t x ) BOOST_NOEXCEPT

 #endif

-#if defined(_MSC_VER) && defined(_M_X64) && defined(BOOST_CORE_HAS_BUILTIN_ISCONSTEVAL)
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) && defined(BOOST_CORE_HAS_BUILTIN_ISCONSTEVAL)

 BOOST_CXX14_CONSTEXPR inline int countl_impl( boost::uint64_t x ) BOOST_NOEXCEPT
 {
@@ -255,7 +255,7 @@ BOOST_CXX14_CONSTEXPR inline int countl_impl( boost::uint64_t x ) BOOST_NOEXCEPT
    }
 }

-#elif defined(_MSC_VER) && defined(_M_X64)
+#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))

 inline int countl_impl( boost::uint64_t x ) BOOST_NOEXCEPT
 {
@@ -455,7 +455,7 @@ inline int countr_impl( boost::uint16_t x ) BOOST_NOEXCEPT

 #endif

-#if defined(_MSC_VER) && defined(_M_X64) && defined(BOOST_CORE_HAS_BUILTIN_ISCONSTEVAL)
+#if defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64)) && defined(BOOST_CORE_HAS_BUILTIN_ISCONSTEVAL)

 BOOST_CXX14_CONSTEXPR inline int countr_impl( boost::uint64_t x ) BOOST_NOEXCEPT
 {
@@ -480,7 +480,7 @@ BOOST_CXX14_CONSTEXPR inline int countr_impl( boost::uint64_t x ) BOOST_NOEXCEPT
    }
 }

-#elif defined(_MSC_VER) && defined(_M_X64)
+#elif defined(_MSC_VER) && (defined(_M_X64) || defined(_M_ARM64))

 inline int countr_impl( boost::uint64_t x ) BOOST_NOEXCEPT
 {
@@ -703,7 +703,7 @@ BOOST_CXX14_CONSTEXPR inline boost::uint32_t bit_ceil_impl( boost::uint32_t x )
 {
    if( x == 0 )
    {
-        return 0;
+        return 1;
    }

    --x;
@@ -723,7 +723,7 @@ BOOST_CXX14_CONSTEXPR inline boost::uint64_t bit_ceil_impl( boost::uint64_t x )
 {
    if( x == 0 )
    {
-        return 0;
+        return 1;
    }

    --x;
@@ -8,8 +8,20 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_CORE_DATA_HPP
 #define BOOST_CORE_DATA_HPP

-#include <initializer_list>
+#include <iterator>
+
+// Note: MSVC doesn't define __cpp_lib_nonmember_container_access but supports the feature even in C++14 mode
+#if (defined(__cpp_lib_nonmember_container_access) && (__cpp_lib_nonmember_container_access >= 201411l)) || \
+    (defined(_MSC_VER) && (_MSC_VER >= 1900))
+
+namespace boost {
+using std::data;
+} /* boost */
+
+#else // (defined(__cpp_lib_nonmember_container_access) ...
+
 #include <cstddef>
+#include <initializer_list>

 namespace boost {

@@ -43,4 +55,6 @@ data(std::initializer_list<T> l) noexcept

 } /* boost */

+#endif // (defined(__cpp_lib_nonmember_container_access) ...
+
 #endif
@@ -10,6 +10,7 @@ Distributed under the Boost Software License, Version 1.0.

 #include <boost/config.hpp>
 #include <new>
+#include <cstddef>

 namespace boost {

@@ -30,7 +30,7 @@

 #if defined( BOOST_CORE_HAS_CXXABI_H )
 # include <cxxabi.h>
-// For some archtectures (mips, mips64, x86, x86_64) cxxabi.h in Android NDK is implemented by gabi++ library
+// For some architectures (mips, mips64, x86, x86_64) cxxabi.h in Android NDK is implemented by gabi++ library
 // (https://android.googlesource.com/platform/ndk/+/master/sources/cxx-stl/gabi++/), which does not implement
 // abi::__cxa_demangle(). We detect this implementation by checking the include guard here.
 # if defined( __GABIXX_CXXABI_H__ )
@@ -0,0 +1,18 @@
+/*
+Copyright 2025 Glen Joseph Fernandes
+(glenjofe@gmail.com)
+
+Distributed under the Boost Software License, Version 1.0.
+(http://www.boost.org/LICENSE_1_0.txt)
+*/
+#undef BOOST_CORE_DETAIL_ASSERT
+
+#if !defined(__clang__) && \
+    !defined(__INTEL_COMPILER) && \
+    defined(__GNUC__) && \
+    (__GNUC__ < 5)
+#define BOOST_CORE_DETAIL_ASSERT(expr) void(0)
+#else
+#include <boost/assert.hpp>
+#define BOOST_CORE_DETAIL_ASSERT(expr) BOOST_ASSERT(expr)
+#endif
@@ -34,6 +34,9 @@
 #if !defined(BOOST_NO_CXX20_HDR_CONCEPTS) // std::common_reference_with
 # include <type_traits>
 #endif
+#if !defined(BOOST_NO_CXX20_HDR_FORMAT)
+# include <format> // std::formatter
+#endif

 namespace boost
 {
@@ -1261,4 +1264,15 @@ struct std::basic_common_reference<

 #endif

+// std::format support
+
+#if !defined(BOOST_NO_CXX20_HDR_FORMAT)
+
+template<class Ch, class Ch2>
+struct std::formatter<boost::core::basic_string_view<Ch>, Ch2>: std::formatter<std::basic_string_view<Ch>, Ch2>
+{
+};
+
+#endif
+
 #endif  // #ifndef BOOST_CORE_STRING_VIEW_HPP_INCLUDED
@@ -551,39 +551,56 @@ inline void lwt_init()
 #define BOOST_TEST_ALL_EQ(begin1, end1, begin2, end2) ( ::boost::detail::test_all_eq_impl(BOOST_LIGHTWEIGHT_TEST_OSTREAM, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, begin1, end1, begin2, end2) )
 #define BOOST_TEST_ALL_WITH(begin1, end1, begin2, end2, predicate) ( ::boost::detail::test_all_with_impl(BOOST_LIGHTWEIGHT_TEST_OSTREAM, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION, begin1, end1, begin2, end2, predicate) )

-#ifndef BOOST_NO_EXCEPTIONS
-   #define BOOST_TEST_THROWS( EXPR, EXCEP )                           \
-      try {                                                           \
-         EXPR;                                                        \
-         ::boost::detail::throw_failed_impl                           \
-         (#EXPR, #EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
-      }                                                               \
-      catch(EXCEP const&) {                                           \
-         ::boost::detail::test_results();                             \
-      }                                                               \
-      catch(...) {                                                    \
-         ::boost::detail::throw_failed_impl                           \
-         (#EXPR, #EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
-      }                                                               \
-   //
+#if !defined(BOOST_MSVC) || (BOOST_MSVC >= 1900)
+// The usual idiom for multiline macros. But disabled for MSVC versions
+// prior to 2015, which would emit a "conditional expression is constant"
+// warning that we could not silence with a _Pragma, despite this being
+// the same thing described here:
+//
+// <https://learn.microsoft.com/en-us/cpp/preprocessor/pragma-directives-and-the-pragma-keyword?view=msvc-140>.
+//
+   #define BOOST_LWT_DETAIL_DO_WHILE_FALSE( x ) do { x } while (false)
 #else
-   #define BOOST_TEST_THROWS( EXPR, EXCEP )
+   #define BOOST_LWT_DETAIL_DO_WHILE_FALSE( x ) x
 #endif

 #ifndef BOOST_NO_EXCEPTIONS
-#  define BOOST_TEST_NO_THROW(EXPR)                                    \
-    try {                                                              \
-        EXPR;                                                          \
-    } catch (const std::exception& e) {                                \
-        ::boost::detail::no_throw_failed_impl                          \
-        (#EXPR, e.what(), __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
-    } catch (...) {                                                    \
-        ::boost::detail::no_throw_failed_impl                          \
-        (#EXPR, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION);           \
-    }
+   #define BOOST_TEST_THROWS( EXPR, EXCEP )                              \
+      BOOST_LWT_DETAIL_DO_WHILE_FALSE(                                   \
+         try {                                                           \
+            EXPR;                                                        \
+            ::boost::detail::throw_failed_impl                           \
+            (#EXPR, #EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+         }                                                               \
+         catch(EXCEP const&) {                                           \
+            ::boost::detail::test_results();                             \
+         }                                                               \
+         catch(...) {                                                    \
+            ::boost::detail::throw_failed_impl                           \
+            (#EXPR, #EXCEP, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+         }                                                               \
+      )
+   //
+#else
+   #define BOOST_TEST_THROWS( EXPR, EXCEP ) BOOST_LWT_DETAIL_DO_WHILE_FALSE((void)0;)
+#endif
+
+#ifndef BOOST_NO_EXCEPTIONS
+#  define BOOST_TEST_NO_THROW(EXPR)                                        \
+     BOOST_LWT_DETAIL_DO_WHILE_FALSE(                                      \
+        try {                                                              \
+            EXPR;                                                          \
+        } catch (const std::exception& e) {                                \
+            ::boost::detail::no_throw_failed_impl                          \
+            (#EXPR, e.what(), __FILE__, __LINE__, BOOST_CURRENT_FUNCTION); \
+        } catch (...) {                                                    \
+            ::boost::detail::no_throw_failed_impl                          \
+            (#EXPR, __FILE__, __LINE__, BOOST_CURRENT_FUNCTION);           \
+        }                                                                  \
+    )
    //
 #else
-#  define BOOST_TEST_NO_THROW(EXPR) { EXPR; }
+#  define BOOST_TEST_NO_THROW(EXPR) BOOST_LWT_DETAIL_DO_WHILE_FALSE(EXPR;)
 #endif

 #endif // #ifndef BOOST_CORE_LIGHTWEIGHT_TEST_HPP
@@ -37,7 +37,7 @@ namespace boost
  /**
   * Casts a scoped enum to its underlying type.
   *
-   * This function is useful when working with scoped enum classes, which doens't implicitly convert to the underlying type.
+   * This function is useful when working with scoped enum classes, which doesn't implicitly convert to the underlying type.
   * @param v A scoped enum.
   * @returns The underlying type.
   * @throws No-throws.
@@ -8,6 +8,18 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_CORE_SIZE_HPP
 #define BOOST_CORE_SIZE_HPP

+#include <iterator>
+
+// Note: MSVC doesn't define __cpp_lib_nonmember_container_access but supports the feature even in C++14 mode
+#if (defined(__cpp_lib_nonmember_container_access) && (__cpp_lib_nonmember_container_access >= 201411l)) || \
+    (defined(_MSC_VER) && (_MSC_VER >= 1900))
+
+namespace boost {
+using std::size;
+} /* boost */
+
+#else // (defined(__cpp_lib_nonmember_container_access) ...
+
 #include <cstddef>

 namespace boost {
@@ -28,4 +40,6 @@ size(T(&)[N]) noexcept

 } /* boost */

+#endif // (defined(__cpp_lib_nonmember_container_access) ...
+
 #endif
@@ -8,20 +8,12 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_CORE_SPAN_HPP
 #define BOOST_CORE_SPAN_HPP

+#include <boost/core/detail/assert.hpp>
 #include <boost/core/data.hpp>
-#include <boost/assert.hpp>
-#include <boost/config.hpp>
-#include <boost/config/workaround.hpp>
 #include <array>
 #include <iterator>
 #include <type_traits>

-#if BOOST_WORKAROUND(BOOST_GCC, < 50000)
-# define BOOST_CORE_SPAN_CONSTEXPR
-#else
-# define BOOST_CORE_SPAN_CONSTEXPR constexpr
-#endif
-
 namespace boost {

 constexpr std::size_t dynamic_extent = static_cast<std::size_t>(-1);
@@ -282,19 +274,19 @@ public:
        return span<T, C>(s_.p + O, C);
    }

-    BOOST_CORE_SPAN_CONSTEXPR span<T, dynamic_extent> first(size_type c) const {
-        return BOOST_ASSERT(c <= size()),
+    constexpr span<T, dynamic_extent> first(size_type c) const {
+        return BOOST_CORE_DETAIL_ASSERT(c <= size()),
            span<T, dynamic_extent>(s_.p, c);
    }

-    BOOST_CORE_SPAN_CONSTEXPR span<T, dynamic_extent> last(size_type c) const {
-        return BOOST_ASSERT(c <= size()),
+    constexpr span<T, dynamic_extent> last(size_type c) const {
+        return BOOST_CORE_DETAIL_ASSERT(c <= size()),
            span<T, dynamic_extent>(s_.p + (s_.n - c), c);
    }

-    BOOST_CORE_SPAN_CONSTEXPR span<T, dynamic_extent> subspan(size_type o,
+    constexpr span<T, dynamic_extent> subspan(size_type o,
        size_type c = dynamic_extent) const {
-        return BOOST_ASSERT(o <= size() &&
+        return BOOST_CORE_DETAIL_ASSERT(o <= size() &&
                (c == dynamic_extent || c + o <= size())),
            span<T, dynamic_extent>(s_.p + o,
                c == dynamic_extent ? s_.n - o : c);
@@ -312,16 +304,16 @@ public:
        return s_.n == 0;
    }

-    BOOST_CORE_SPAN_CONSTEXPR reference operator[](size_type i) const {
-        return BOOST_ASSERT(i < size()), s_.p[i];
+    constexpr reference operator[](size_type i) const {
+        return BOOST_CORE_DETAIL_ASSERT(i < size()), s_.p[i];
    }

-    BOOST_CORE_SPAN_CONSTEXPR reference front() const {
-        return BOOST_ASSERT(!empty()), *s_.p;
+    constexpr reference front() const {
+        return BOOST_CORE_DETAIL_ASSERT(!empty()), *s_.p;
    }

-    BOOST_CORE_SPAN_CONSTEXPR reference back() const {
-        return BOOST_ASSERT(!empty()), s_.p[s_.n - 1];
+    constexpr reference back() const {
+        return BOOST_CORE_DETAIL_ASSERT(!empty()), s_.p[s_.n - 1];
    }

    constexpr pointer data() const noexcept {
@@ -411,6 +403,4 @@ as_writable_bytes(span<T, E> s) noexcept

 } /* boost */

-#undef BOOST_CORE_SPAN_CONSTEXPR
-
 #endif
@@ -405,6 +405,9 @@ compile sv_construct_test_cx2.cpp ;

 run sv_hash_test.cpp : : : $(CPP11) <library>/boost/container_hash//boost_container_hash ;

+run sv_format_test.cpp
+  : : : $(pedantic-errors) ;
+
 run span_test.cpp ;
 run span_types_test.cpp ;
 run span_constructible_test.cpp ;
@@ -413,6 +416,7 @@ run span_constexpr_test.cpp ;
 run as_bytes_test.cpp ;
 run as_writable_bytes_test.cpp ;
 compile span_boost_begin_test.cpp ;
+compile span_nonmem_data_size_test.cpp ;
 run make_span_test.cpp ;

 run splitmix64_test.cpp
@@ -19,14 +19,15 @@ template<class T> void test_bit_ceil( T x )

    T y = boost::core::bit_ceil( x );

+    BOOST_TEST( boost::core::has_single_bit( y ) );
+    BOOST_TEST_GE( +y, +x );
+
    if( x == 0 )
    {
-        BOOST_TEST_EQ( y, 0 );
+        BOOST_TEST_EQ( y, 1 );
    }
    else
    {
-        BOOST_TEST( boost::core::has_single_bit( y ) );
-        BOOST_TEST_GE( +y, +x );
        BOOST_TEST_LT( y >> 1, +x );
    }
 }
@@ -9,6 +9,7 @@ Distributed under the Boost Software License, Version 1.0.
 #if !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
 #include <boost/core/data.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <iterator>

 class range {
 public:
@@ -52,12 +53,28 @@ void test_initializer_list()
    BOOST_TEST_EQ(boost::data(l), l.begin());
 }

+void test_ambiguity_with_std_data()
+{
+// Note: This preprocessor check should be equivalent to that in boost/core/data.hpp
+#if (defined(__cpp_lib_nonmember_container_access) && (__cpp_lib_nonmember_container_access >= 201411l)) || \
+    (defined(_MSC_VER) && (_MSC_VER >= 1900))
+
+    // https://github.com/boostorg/core/issues/206
+    range c;
+    using std::data;
+    using boost::data;
+    BOOST_TEST_EQ(data(c), c.data());
+
+#endif
+}
+
 int main()
 {
    test_range();
    test_const_range();
    test_array();
    test_initializer_list();
+    test_ambiguity_with_std_data();
    return boost::report_errors();
 }
 #else
@@ -31,7 +31,7 @@ using std::distance;

 */

-// struct C {} doesn't wotk with libc++.
+// struct C {} doesn't work with libc++.
 typedef std::forward_iterator_tag C;

 struct T
@@ -9,6 +9,7 @@ Distributed under the Boost Software License, Version 1.0.
 #if !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
 #include <boost/core/size.hpp>
 #include <boost/core/lightweight_test.hpp>
+#include <iterator>

 struct range {
    std::size_t size() const {
@@ -28,10 +29,26 @@ void test_array()
    BOOST_TEST_EQ(boost::size(a), 4);
 }

+void test_ambiguity_with_std_size()
+{
+// Note: This preprocessor check should be equivalent to that in boost/core/size.hpp
+#if (defined(__cpp_lib_nonmember_container_access) && (__cpp_lib_nonmember_container_access >= 201411l)) || \
+    (defined(_MSC_VER) && (_MSC_VER >= 1900))
+
+    // https://github.com/boostorg/core/issues/206
+    range c;
+    using std::size;
+    using boost::size;
+    BOOST_TEST_EQ(size(c), c.size());
+
+#endif
+}
+
 int main()
 {
    test_range();
    test_array();
+    test_ambiguity_with_std_size();
    return boost::report_errors();
 }
 #else
@@ -6,8 +6,7 @@ Distributed under the Boost Software License, Version 1.0.
 (http://www.boost.org/LICENSE_1_0.txt)
 */
 #include <boost/config.hpp>
-#include <boost/config/workaround.hpp>
-#if !defined(BOOST_NO_CXX11_CONSTEXPR) && !BOOST_WORKAROUND(BOOST_GCC, < 50000)
+#if !defined(BOOST_NO_CXX11_CONSTEXPR)
 #include <boost/core/span.hpp>
 #include <boost/core/lightweight_test.hpp>

@@ -0,0 +1,44 @@
+/*
+ *             Copyright Andrey Semashev 2025.
+ * Distributed under 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)
+ */
+/*
+ * The test verifies that unqualified calls to data() and size()
+ * don't cause ambiguity between std:: and boost:: implementations.
+ * The ambiguity used to be caused by ADL bringing boost::data()/size()
+ * due to namespace of boost::span and a using-declaration of
+ * std::data()/size().
+ *
+ * https://github.com/boostorg/core/issues/206
+ */
+
+#include <boost/config.hpp>
+
+#if !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
+
+#include <boost/core/span.hpp>
+#include <iterator>
+
+// Note: This preprocessor check should be equivalent to those in boost/core/data.hpp and boost/core/size.hpp
+#if (defined(__cpp_lib_nonmember_container_access) && (__cpp_lib_nonmember_container_access >= 201411l)) || \
+    (defined(_MSC_VER) && (_MSC_VER >= 1900))
+
+#include <boost/core/data.hpp>
+#include <boost/core/size.hpp>
+
+int* test_data_ambiguity(boost::span<int> sp)
+{
+    using std::data;
+    return data(sp);
+}
+
+boost::span<int>::size_type test_size_ambiguity(boost::span<int> sp)
+{
+    using std::size;
+    return size(sp);
+}
+
+#endif // (defined(__cpp_lib_nonmember_container_access) ...
+#endif // !defined(BOOST_NO_CXX11_CONSTEXPR) && !defined(BOOST_NO_CXX11_DECLTYPE)
@@ -0,0 +1,30 @@
+// Copyright 2025 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/core/detail/string_view.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <boost/config.hpp>
+#include <boost/config/pragma_message.hpp>
+
+#if !( defined(__cpp_lib_format) && __cpp_lib_format >= 201907L )
+
+BOOST_PRAGMA_MESSAGE( "Test skipped because __cpp_lib_format is not defined to at least 201907L" )
+int main() {}
+
+#else
+
+#include <format>
+#include <string_view>
+
+int main()
+{
+    BOOST_TEST_EQ( std::format( "{}", boost::core::string_view( "123" ) ), std::format( "{}", std::string_view( "123" ) ) );
+    BOOST_TEST_EQ( std::format( "{:s}", boost::core::string_view( "123" ) ), std::format( "{:s}", std::string_view( "123" ) ) );
+    BOOST_TEST_EQ( std::format( "{:^7}", boost::core::string_view( "123" ) ), std::format( "{:^7}", std::string_view( "123" ) ) );
+    BOOST_TEST_EQ( std::format( "{:-^7}", boost::core::string_view( "123" ) ), std::format( "{:-^7}", std::string_view( "123" ) ) );
+
+    return boost::report_errors();
+}
+
+#endif
@@ -9,7 +9,7 @@
 // objects to be swapped would themselves be from the boost namespace.
 // If so, boost::core::invoke_swap itself might be found by argument dependent lookup.
 // The implementation of boost::core::invoke_swap resolves this issue by giving
-// boost::core::invoke_swap two template argumetns, thereby making it less specialized
+// boost::core::invoke_swap two template arguments, thereby making it less specialized
 // than std::swap.

 #include <boost/core/invoke_swap.hpp>
@@ -12,7 +12,7 @@
 //Put test class in the global namespace
 #include "./swap_test_class.hpp"

-//Provide swap function in gloabl namespace
+//Provide swap function in global namespace
 void swap(swap_test_class& left, swap_test_class& right)
 {
  left.swap(right);
Author	SHA1	Message	Date
Peter Dimov	fb34afaabd	Correct CMake version check; VERSION_GREATER 3.18 is true for 3.18.1	2025-10-20 02:10:33 +03:00
Andrey Semashev	e8fdc407bd	Added a changelog entry for the lightweight_test.hpp change. Refs https://github.com/boostorg/core/pull/205.	2025-10-19 22:14:36 +03:00
Andrey Semashev	64093058de	Added a changelog entry for the boost::data/size change.	2025-10-19 22:08:39 +03:00
Andrey Semashev	3cd29323be	Add a test for boost::span verifying unqualified calls to data()/size(). The test checks that unqualified calls to data()/size() with boost::span as argument don't cause ambiguity between std:: and boost:: implementations. Fixes https://github.com/boostorg/core/issues/206.	2025-10-19 21:56:04 +03:00
Andrey Semashev	45bd9bf69b	Use std::data and std::size for boost equivalents, when possible. This avoids the potential ambiguity between boost:: and std:: functions when the user calls data() or size() unqualified and both alternatives are found via ADL. Refs https://github.com/boostorg/core/issues/206.	2025-10-19 21:56:04 +03:00
Peter Dimov	6814bc508c	Merge pull request #205 from gennaroprota/fix/use_do_while_false_for_boost_test_throws_and_boost_test_no_throw Use the do {} while (false) idiom for BOOST_TEST_THROWS() and BOOST_TEST_NO_THROW()	2025-10-18 16:06:01 +03:00
Gennaro Prota	40fda50ae1	Omit do {} while (false) for MSVC versions prior to 2015 Reason: See the new code comment.	2025-10-15 12:30:48 +02:00
Gennaro Prota	8a352e253a	Use the do {} while (false) idiom for BOOST_TEST_THROWS() and BOOST_TEST_NO_THROW() Reason: Common hygiene for multi-line macros. Makes things like if (condition) BOOST_TEST_THROWS(...); else ... work correctly. Also, it doesn't generate an empty statement (which compilers may warn about) when the user adds a semicolon (which they usually do).	2025-10-09 19:00:47 +02:00
Andrey Semashev	c6b098d25d	Merge pull request #201 from Flamefire/test-link-update Update Link to regression test matrix in README	2025-08-25 19:05:15 +03:00
Alexander Grund	c4bfbf9ec5	Update Link to regression test matrix in README	2025-08-25 17:26:11 +02:00
Peter Dimov	a128501403	Update revision history	2025-06-30 13:06:07 +03:00
Peter Dimov	24b5bb625e	Update .drone.jsonnet	2025-06-25 20:26:52 +03:00
Peter Dimov	d513ed162a	Update .drone.jsonnet	2025-06-25 19:28:05 +03:00
Peter Dimov	65337d1af8	Add a std::formatter specialization for core::string_view. Fixes #190 .	2025-06-25 17:11:26 +03:00
Peter Dimov	16d8f5f8ff	Add sv_format_test.cpp. Refs #190 .	2025-06-25 16:51:59 +03:00
Andrey Semashev	58f469cd80	Added ARM jobs in GitHub Actions.	2025-06-13 02:30:14 +03:00
Andrey Semashev	457d6a8ad0	Use Azure mirrors of Ubuntu .deb repositories in containers. This reduces the likelihood of spurious CI failures caused by DDoS filters being triggered by massive numbers of concurrent CI jobs.	2025-06-13 02:23:02 +03:00
Andrey Semashev	e3d8de377b	Removed windows-2019 jobs from GitHub Actions. The windows-2019 image is deprecated and is about to be removed. https://github.com/actions/runner-images/issues/12045	2025-06-13 02:21:12 +03:00
Peter Dimov	8d25b9ce54	Add missing include	2025-06-06 21:47:38 +03:00
Peter Dimov	6e05e5e764	Update ci.yml	2025-06-06 21:00:18 +03:00
Peter Dimov	7cb3e689e0	Update bit_ceil_test.cpp	2025-06-06 19:03:11 +03:00
Peter Dimov	11d367377f	Merge pull request #199 from Pega5us/fix-issue#197-bitceil 🐛 Fix bit_ceil() to return 1 for input 0 as per specification	2025-06-06 18:17:15 +03:00
Abhay Kumar	f32cb2f696	🐛 Fix bit_ceil() to return 1 for input 0 as per specification	2025-06-06 14:23:26 +05:30
Peter Dimov	21761b3f62	Merge pull request #192 from mborland/msvc_clz Use bit scan intrinsic on Windows ARM64 platform	2025-04-16 15:13:43 +03:00
Peter Dimov	2e87ab53f7	Merge pull request #193 from striezel-stash/ci-ubuntu-20.04-deprecation Move Ubuntu 20.04 builds to container or newer Ubuntu version	2025-04-16 15:12:26 +03:00
Andrey Semashev	8d5ee24c97	Merge pull request #194 from striezel-stash/fix-typos Fix a few typos	2025-04-16 04:19:08 +03:00
Dirk Stolle	db59ef2a81	Fix a few typos	2025-04-16 02:16:49 +02:00
Dirk Stolle	c48b7f269f	Move Ubuntu 20.04 builds to container or newer Ubuntu version The Ubuntu 20.04 image on GitHub Actions will be unavailable by 2025-04-15. See <https://github.com/actions/runner-images/issues/11101> for more information on the deprecation and removal. Therefore all build jobs that use the Ubuntu 20.04 runner image of GHA have to be either migrated to a newer runner image (if the compiler version is available on a newer image) or have to be moved to Docker containers using Ubuntu 20.04 (if the compiler version is not available on the newer runner images).	2025-04-16 02:07:28 +02:00
Matt Borland	4c74671f73	Use bit scan intrinsic on ARM64 platform	2025-04-10 08:35:11 -04:00