Adds support for C++20 modules

CMakeLists.txt

@@ -3,17 +3,29 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
-cmake_minimum_required(VERSION 3.5...3.20)
+cmake_minimum_required(VERSION 3.5...3.31)
 
 project(boost_core VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
 
-add_library(boost_core INTERFACE)
-add_library(Boost::core ALIAS boost_core)
+if (BOOST_USE_MODULES)
+  add_library(boost_core STATIC)
+  target_sources(boost_core PUBLIC FILE_SET CXX_MODULES BASE_DIRS modules FILES modules/boost_core.cppm)
+  set(__scope PUBLIC)
+
+  # Enable and propagate C++23, import std, and the modules macro
+  target_compile_features(boost_core PUBLIC cxx_std_23)
+  set_target_properties(boost_core PROPERTIES CXX_MODULE_STD 1)
+  target_compile_definitions(boost_core PUBLIC BOOST_USE_MODULES)
 
-target_include_directories(boost_core INTERFACE include)
+else()
+  add_library(boost_core INTERFACE)
+  set(__scope INTERFACE)
+endif()
 
+add_library(Boost::core ALIAS boost_core)
+target_include_directories(boost_core ${__scope} include)
 target_link_libraries(boost_core
-  INTERFACE
+  ${__scope}
     Boost::assert
     Boost::config
     Boost::throw_exception

appveyor.yml

@@ -79,6 +79,7 @@ install:
   - git submodule update --init tools/boostdep
   - xcopy /s /e /q %APPVEYOR_BUILD_FOLDER% libs\core\
   - python tools/boostdep/depinst/depinst.py --git_args "--jobs %GIT_FETCH_JOBS%" core
+  - python libs/core/tools/setup_boost_with_modules.py # Temporary
   - cmd /c bootstrap
   - b2 -d0 headers
 

include/boost/core/addressof.hpp

@@ -14,6 +14,17 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_CORE_ADDRESSOF_HPP
 #define BOOST_CORE_ADDRESSOF_HPP
 
+#if defined(BOOST_USE_MODULES) && !defined(BOOST_CORE_INTERFACE_UNIT)
+
+#ifndef BOOST_IN_MODULE_PURVIEW
+import boost.core;
+#endif
+
+#else
+
+// RP TODO: BOOST_CORE_HAS_BUILTIN_ADDRESSOF
+
+#include <boost/core/detail/modules.hpp>
 #include <boost/config.hpp>
 
 #if defined(BOOST_MSVC_FULL_VER) && BOOST_MSVC_FULL_VER >= 190024215
@@ -33,7 +44,7 @@ Distributed under the Boost Software License, Version 1.0.
 
 namespace boost {
 
-template<class T>
+BOOST_CORE_MODULE_EXPORT template<class T>
 BOOST_CONSTEXPR inline T*
 addressof(T& o) BOOST_NOEXCEPT
 {
@@ -43,7 +54,7 @@ addressof(T& o) BOOST_NOEXCEPT
 } /* boost */
 #else
 #include <boost/config/workaround.hpp>
-#include <cstddef>
+#include <boost/config/std/cstddef.hpp>
 
 namespace boost {
 namespace detail {
@@ -143,7 +154,7 @@ struct addrof_result {
 
 } /* detail */
 
-template<class T, std::size_t N>
+BOOST_CORE_MODULE_EXPORT template<class T, std::size_t N>
 BOOST_FORCEINLINE typename boost::detail::addrof_result<T[N]>::type
 addressof(T (&o)[N]) BOOST_NOEXCEPT
 {
@@ -152,14 +163,14 @@ addressof(T (&o)[N]) BOOST_NOEXCEPT
 #endif
 
 #if BOOST_WORKAROUND(BOOST_BORLANDC, BOOST_TESTED_AT(0x564))
-template<class T, std::size_t N>
+BOOST_CORE_MODULE_EXPORT template<class T, std::size_t N>
 BOOST_FORCEINLINE
 T (*addressof(T (&o)[N]) BOOST_NOEXCEPT)[N]
 {
    return reinterpret_cast<T(*)[N]>(&o);
 }
 
-template<class T, std::size_t N>
+BOOST_CORE_MODULE_EXPORT template<class T, std::size_t N>
 BOOST_FORCEINLINE
 const T (*addressof(const T (&o)[N]) BOOST_NOEXCEPT)[N]
 {
@@ -250,7 +261,7 @@ addressof(T& o) BOOST_NOEXCEPT
 
 } /* detail */
 
-template<class T>
+BOOST_CORE_MODULE_EXPORT template<class T>
 constexpr BOOST_FORCEINLINE T*
 addressof(T& o) BOOST_NOEXCEPT
 {
@@ -265,10 +276,12 @@ addressof(T& o) BOOST_NOEXCEPT
     !defined(BOOST_NO_CXX11_DELETED_FUNCTIONS)
 namespace boost {
 
-template<class T>
+BOOST_CORE_MODULE_EXPORT template<class T>
 const T* addressof(const T&&) = delete;
 
 } /* boost */
 #endif
 
 #endif
+
+#endif

include/boost/core/alignof.hpp

@@ -1,3 +1,8 @@
+// Make the header safe to include from libraries supporting modules
+#if defined(BOOST_IN_MODULE_PURVIEW) && !defined(BOOST_CORE_ALIGNOF_HPP_INCLUDED)
+#  error "Please #include <boost/core/alignof.hpp> in your module global fragment"
+#endif
+
 #ifndef BOOST_CORE_ALIGNOF_HPP_INCLUDED
 #define BOOST_CORE_ALIGNOF_HPP_INCLUDED
 
@@ -12,7 +17,7 @@
 //  https://www.boost.org/LICENSE_1_0.txt
 
 #include <boost/config.hpp>
-#include <cstddef>
+#include <boost/config/std/cstddef.hpp>
 
 #if !defined(BOOST_NO_CXX11_ALIGNOF)
 

include/boost/core/alloc_construct.hpp

@@ -8,28 +8,35 @@ Distributed under the Boost Software License, Version 1.0.
 #ifndef BOOST_CORE_ALLOC_CONSTRUCT_HPP
 #define BOOST_CORE_ALLOC_CONSTRUCT_HPP
 
+#if defined(BOOST_USE_MODULES) && !defined(BOOST_CORE_INTERFACE_UNIT)
+#ifndef BOOST_IN_MODULE_PURVIEW
+import boost.core;
+#endif
+#else
+
 /*
 This functionality is now in <boost/core/allocator_access.hpp>.
 */
 #include <boost/core/noinit_adaptor.hpp>
+#include <boost/core/detail/modules.hpp>
 
 namespace boost {
 
-template<class A, class T>
+BOOST_CORE_MODULE_EXPORT template<class A, class T>
 inline void
 alloc_destroy(A& a, T* p)
 {
     boost::allocator_destroy(a, p);
 }
 
-template<class A, class T>
+BOOST_CORE_MODULE_EXPORT template<class A, class T>
 inline void
 alloc_destroy_n(A& a, T* p, std::size_t n)
 {
     boost::allocator_destroy_n(a, p, n);
 }
 
-template<class A, class T>
+BOOST_CORE_MODULE_EXPORT template<class A, class T>
 inline void
 alloc_construct(A& a, T* p)
 {
@@ -38,52 +45,52 @@ alloc_construct(A& a, T* p)
 
 #if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
 #if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
-template<class A, class T, class U, class... V>
+BOOST_CORE_MODULE_EXPORT template<class A, class T, class U, class... V>
 inline void
 alloc_construct(A& a, T* p, U&& u, V&&... v)
 {
     boost::allocator_construct(a, p, std::forward<U>(u),
         std::forward<V>(v)...);
 }
 #else
-template<class A, class T, class U>
+BOOST_CORE_MODULE_EXPORT template<class A, class T, class U>
 inline void
 alloc_construct(A& a, T* p, U&& u)
 {
     boost::allocator_construct(a, p, std::forward<U>(u));
 }
 #endif
 #else
-template<class A, class T, class U>
+BOOST_CORE_MODULE_EXPORT template<class A, class T, class U>
 inline void
 alloc_construct(A& a, T* p, const U& u)
 {
     boost::allocator_construct(a, p, u);
 }
 
-template<class A, class T, class U>
+BOOST_CORE_MODULE_EXPORT template<class A, class T, class U>
 inline void
 alloc_construct(A& a, T* p, U& u)
 {
     boost::allocator_construct(a, p, u);
 }
 #endif
 
-template<class A, class T>
+BOOST_CORE_MODULE_EXPORT template<class A, class T>
 inline void
 alloc_construct_n(A& a, T* p, std::size_t n)
 {
     boost::allocator_construct_n(a, p, n);
 }
 
-template<class A, class T>
+BOOST_CORE_MODULE_EXPORT template<class A, class T>
 inline void
 alloc_construct_n(A& a, T* p, std::size_t n, const T* l, std::size_t m)
 {
     boost::allocator_construct_n(a, p, n, l, m);
 }
 
-template<class A, class T, class I>
+BOOST_CORE_MODULE_EXPORT template<class A, class T, class I>
 inline void
 alloc_construct_n(A& a, T* p, std::size_t n, I b)
 {
@@ -93,3 +100,5 @@ alloc_construct_n(A& a, T* p, std::size_t n, I b)
 } /* boost */
 
 #endif
+
+#endif