Skip to content

Commit 7c69f1a

Browse files
committed
Merge branch 'develop'
2 parents 90697ee + a47c9f5 commit 7c69f1a

102 files changed

Lines changed: 2304 additions & 4135 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.drone.jsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
319319
linux_pipeline(
320320
"Linux 18.04 Clang 5.0",
321321
"cppalliance/droneubuntu1804:1",
322-
{ TOOLSET: 'clang', COMPILER: 'clang++-5.0', CXXSTD: '11,14,1z' },
322+
{ TOOLSET: 'clang', COMPILER: 'clang++-5.0', CXXSTD: '11,14' },
323323
"clang-5.0",
324324
),
325325

.github/workflows/ci.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ jobs:
9393
install: clang-4.0
9494
- toolset: clang
9595
compiler: clang++-5.0
96-
cxxstd: "11,14,1z"
96+
cxxstd: "11,14"
9797
os: ubuntu-latest
9898
container: ubuntu:18.04
9999
install: clang-5.0
@@ -176,11 +176,26 @@ jobs:
176176
os: ubuntu-latest
177177
install: clang-18
178178
- toolset: clang
179+
compiler: clang++-19
179180
cxxstd: "11,14,17,20,2b"
180-
os: macos-13
181+
container: ubuntu:24.04
182+
os: ubuntu-latest
183+
install: clang-19
184+
- toolset: clang
185+
compiler: clang++-20
186+
cxxstd: "11,14,17,20,23,2c"
187+
container: ubuntu:24.04
188+
os: ubuntu-latest
189+
install: clang-20
181190
- toolset: clang
182191
cxxstd: "11,14,17,20,2b"
183192
os: macos-14
193+
- toolset: clang
194+
cxxstd: "11,14,17,20,23,2c"
195+
os: macos-15
196+
- toolset: clang
197+
cxxstd: "11,14,17,20,23,2c"
198+
os: macos-26
184199

185200
runs-on: ${{matrix.os}}
186201
container:

CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
# Distributed under the Boost Software License, Version 1.0.
44
# https://www.boost.org/LICENSE_1_0.txt
55

6-
cmake_minimum_required(VERSION 3.5...3.16)
6+
cmake_minimum_required(VERSION 3.8...3.16)
77

88
project(boost_multi_index VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
99

1010
add_library(boost_multi_index INTERFACE)
1111
add_library(Boost::multi_index ALIAS boost_multi_index)
12+
target_compile_features(boost_multi_index INTERFACE cxx_std_11)
1213

1314
target_include_directories(boost_multi_index INTERFACE include)
1415

@@ -20,12 +21,9 @@ target_link_libraries(boost_multi_index
2021
Boost::container_hash
2122
Boost::core
2223
Boost::integer
23-
Boost::iterator
24-
Boost::move
25-
Boost::mpl
24+
Boost::mp11
2625
Boost::preprocessor
2726
Boost::smart_ptr
28-
Boost::static_assert
2927
Boost::throw_exception
3028
Boost::tuple
3129
Boost::type_traits

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![Branch](https://img.shields.io/badge/branch-master-brightgreen.svg)](https://github.com/boostorg/multi_index/tree/master) [![CI](https://github.com/boostorg/multi_index/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/boostorg/multi_index/actions/workflows/ci.yml) [![Drone status](https://img.shields.io/drone/build/boostorg/multi_index/master?server=https%3A%2F%2Fdrone.cpp.al&logo=drone&logoColor=%23CCCCCC&label=CI)](https://drone.cpp.al/boostorg/multi_index) [![Deps](https://img.shields.io/badge/deps-master-brightgreen.svg)](https://pdimov.github.io/boostdep-report/master/multi_index.html) [![Documentation](https://img.shields.io/badge/docs-master-brightgreen.svg)](https://www.boost.org/doc/libs/master/libs/multi_index) [![Enter the Matrix](https://img.shields.io/badge/matrix-master-brightgreen.svg)](https://regression.boost.org/master/developer/multi_index.html)<br/>
44
[![Branch](https://img.shields.io/badge/branch-develop-brightgreen.svg)](https://github.com/boostorg/multi_index/tree/develop) [![CI](https://github.com/boostorg/multi_index/actions/workflows/ci.yml/badge.svg?branch=develop)](https://github.com/boostorg/multi_index/actions/workflows/ci.yml) [![Drone status](https://img.shields.io/drone/build/boostorg/multi_index/develop?server=https%3A%2F%2Fdrone.cpp.al&logo=drone&logoColor=%23CCCCCC&label=CI)](https://drone.cpp.al/boostorg/multi_index) [![Deps](https://img.shields.io/badge/deps-develop-brightgreen.svg)](https://pdimov.github.io/boostdep-report/develop/multi_index.html) [![Documentation](https://img.shields.io/badge/docs-develop-brightgreen.svg)](https://www.boost.org/doc/libs/develop/libs/multi_index) [![Enter the Matrix](https://img.shields.io/badge/matrix-develop-brightgreen.svg)](https://regression.boost.org/develop/developer/multi_index.html)<br/>
5-
[![BSL 1.0](https://img.shields.io/badge/license-BSL_1.0-blue.svg)](https://www.boost.org/users/license.html) <img alt="Header-only library" src="https://img.shields.io/badge/build-header--only-blue.svg">
5+
[![BSL 1.0](https://img.shields.io/badge/license-BSL_1.0-blue.svg)](https://www.boost.org/users/license.html) <img alt="C++11 required" src="https://img.shields.io/badge/standard-C%2b%2b11-blue.svg"> <img alt="Header-only library" src="https://img.shields.io/badge/build-header--only-blue.svg">
66

77
[Boost.MultiIndex](http://boost.org/libs/multi_index) provides a class template
88
named `multi_index_container` which enables the construction of containers

build.jam

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,9 @@ constant boost_dependencies :
1212
/boost/container_hash//boost_container_hash
1313
/boost/core//boost_core
1414
/boost/integer//boost_integer
15-
/boost/iterator//boost_iterator
16-
/boost/move//boost_move
17-
/boost/mpl//boost_mpl
15+
/boost/mp11//boost_mp11
1816
/boost/preprocessor//boost_preprocessor
1917
/boost/smart_ptr//boost_smart_ptr
20-
/boost/static_assert//boost_static_assert
2118
/boost/throw_exception//boost_throw_exception
2219
/boost/tuple//boost_tuple
2320
/boost/type_traits//boost_type_traits

0 commit comments

Comments
 (0)