adapted core to Mp11-based index specification in MultiIndex

Author: joaquintides

.github/workflows/ci.yml

@@ -7,6 +7,7 @@ on:
       - master
       - develop
       - feature/**
+      - fix/**
 
 env:
   UBSAN_OPTIONS: print_stacktrace=1

include/boost/bimap/detail/bimap_core.hpp

@@ -1,6 +1,7 @@
 // Boost.Bimap
 //
 // Copyright (c) 2006-2007 Matias Capeletto
+// Copyright (c) 2025 Joaquin M Lopez Munoz
 //
 // Distributed under the Boost Software License, Version 1.0.
 // (See accompanying file LICENSE_1_0.txt or copy at
@@ -45,6 +46,10 @@
 #include <boost/bimap/detail/map_view_iterator.hpp>
 #include <boost/bimap/detail/set_view_iterator.hpp>
 
+#ifndef BOOST_MULTI_INDEX_ENABLE_MPL_SUPPORT
+#include <boost/bimap/detail/mpl_to_mp11_list.hpp>
+#endif
+
 #include <boost/bimap/set_of.hpp>
 #include <boost/bimap/unconstrained_set_of.hpp>
 #include <boost/core/allocator_access.hpp>
@@ -394,8 +399,16 @@ class bimap_core
 
     >::type complete_core_indices;
 
+#ifndef BOOST_MULTI_INDEX_ENABLE_MPL_SUPPORT
+
+    using core_indices = mpl_to_mp11_list< complete_core_indices >;
+
+#else
+
     struct core_indices : public complete_core_indices {};
 
+#endif
+
     // Define the core using compute_index_type to translate the
     // set type to an multi-index specification
     // --------------------------------------------------------------------

include/boost/bimap/detail/mpl_to_mp11_list.hpp

@@ -0,0 +1,63 @@
+// Boost.Bimap
+//
+// Copyright (c) 2025 Joaquin M Lopez Munoz
+//
+// 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)
+
+
+#ifndef BOOST_BIMAP_DETAIL_MPL_TO_MP11_LIST_HPP
+#define BOOST_BIMAP_DETAIL_MPL_TO_MP11_LIST_HPP
+
+#if defined(_MSC_VER)
+#pragma once
+#endif
+
+#include <boost/mp11/list.hpp>
+#include <boost/mpl/begin_end.hpp>
+#include <boost/mpl/deref.hpp>
+#include <boost/mpl/next.hpp>
+
+/** \struct boost::bimaps::detail::mpl_to_mp11_list
+
+\brief Converts a MPL sequence to a Mp11 list
+
+\code
+using mp11_list = mpl_to_mp11_list< mpl_sequence >;
+\endcode
+                                                                        **/
+
+#ifndef BOOST_BIMAP_DOXYGEN_WILL_NOT_PROCESS_THE_FOLLOWING_LINES
+
+namespace boost {
+namespace bimaps {
+namespace detail {
+
+template< typename First, typename Last, typename... Ts >
+struct mpl_to_mp11_list_impl: mpl_to_mp11_list_impl
+<
+    typename mpl::next<First>::type, Last,
+    Ts..., typename mpl::deref<First>::type
+> {};
+
+template< typename Last, typename... Ts >
+struct mpl_to_mp11_list_impl< Last, Last, Ts... >
+{
+    using type = mp11::mp_list< Ts... >;
+};
+
+template< typename TypeList >
+using mpl_to_mp11_list=typename mpl_to_mp11_list_impl
+<
+    typename mpl::begin<TypeList>::type,
+    typename mpl::end<TypeList>::type
+>::type;
+
+} // namespace detail
+} // namespace bimaps
+} // namespace boost
+
+#endif // BOOST_BIMAP_DOXYGEN_WILL_NOT_PROCESS_THE_FOLLOWING_LINES
+
+#endif // BOOST_BIMAP_DETAIL_MPL_TO_MP11_LIST_HPP