Add support for modular build structure. (#29)

This is part of the effort to make the Boost libraries "modular" for build and consumption. See https://lists.boost.org/Archives/boost/2024/01/255704.php and https://github.com/grafikrobot/boost-b2-modular/blob/b2-modular/README.adoc for more information.

This PR depends on the following other PRs being merged to both develop and master branches of the respective repos:

- https://github.com/boostorg/boost/pull/854

This PR will be changed to ready for review, i.e. not draft, when the above are merged. Do not merge this one until that time.

.github/workflows/ci.yml

@@ -17,29 +17,16 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - toolset: gcc-7
-            cxxstd: "03,11,14,17"
-            os: ubuntu-18.04
-          - toolset: gcc-9
+          - toolset: gcc-12
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
-          - toolset: gcc-10
-            cxxstd: "03,11,14,17,2a"
-            os: ubuntu-18.04
+            os: ubuntu-22.04
             cxxflags: "cxxflags=--coverage -fsanitize=address,leak,undefined -fno-sanitize-recover=undefined"
             linkflags: "linkflags=--coverage -lasan -lubsan"
-            gcov_tool: "gcov-10"
+            gcov_tool: "gcov-12"
           - toolset: clang
-            compiler: clang++-10
+            compiler: clang++-14
             cxxstd: "03,11,14,17,2a"
-            os: ubuntu-20.04
-            cxxflags: "cxxflags=-fsanitize=address,undefined,integer -fno-sanitize-recover=undefined"
-            linkflags: "linkflags=-fsanitize=address,undefined,integer"
-          - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: macos-10.15
-            cxxflags: "cxxflags=-fsanitize=address,undefined -fno-sanitize-recover=undefined"
-            linkflags: "linkflags=-fsanitize=address,undefined"
+            os: ubuntu-22.04
 
     runs-on: ${{matrix.os}}
 
@@ -88,9 +75,9 @@ jobs:
 
           echo -e "#!/bin/bash\nexec ${{matrix.gcov_tool}} \"\$@\"" > $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh
           chmod +x $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh
-          wget https://github.com/linux-test-project/lcov/archive/v1.15.zip
-          unzip v1.15.zip
-          LCOV="`pwd`/lcov-1.15/bin/lcov --gcov-tool $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh"
+          wget https://github.com/linux-test-project/lcov/archive/v1.16.zip
+          unzip v1.16.zip
+          LCOV="`pwd`/lcov-1.16/bin/lcov --gcov-tool $GITHUB_WORKSPACE/coveralls/gcov_wrapper.sh"
 
           echo "$LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory `pwd`/libs/$LIBRARY/test --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info"
           $LCOV --directory ../boost-root/bin.v2/libs/$LIBRARY/ --base-directory ../boost-root/ --capture --output-file $GITHUB_WORKSPACE/coveralls/coverage.info
@@ -114,10 +101,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - toolset: msvc-14.1
-            cxxstd: "14,17,latest"
-            addrmd: 32,64
-            os: windows-2016
           - toolset: msvc-14.2
             cxxstd: "14,17,latest"
             addrmd: 32,64

CMakeLists.txt

@@ -14,9 +14,6 @@ target_link_libraries( boost_conversion
     INTERFACE
         Boost::assert
         Boost::config
-        Boost::core
         Boost::smart_ptr
         Boost::throw_exception
-        Boost::type_traits
-        Boost::typeof
 )

build.jam

@@ -0,0 +1,26 @@
+# Copyright René Ferdinand Rivera Morell 2023-2024
+# 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)
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/assert//boost_assert
+    /boost/config//boost_config
+    /boost/smart_ptr//boost_smart_ptr
+    /boost/throw_exception//boost_throw_exception ;
+
+project /boost/conversion
+    : common-requirements
+        <include>include
+    ;
+
+explicit
+    [ alias boost_conversion : : : : <library>$(boost_dependencies) ]
+    [ alias all : boost_conversion test ]
+    ;
+
+call-if : boost-library conversion
+    ;
+

doc/conversion.qbk

@@ -1,6 +1,6 @@
 [/
     Copyright 2016 Mikhail Maximov.
-    Copyright Antony Polukhin, 2020-2022.
+    Copyright Antony Polukhin, 2020-2024.
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying
     file LICENSE_1_0.txt or copy at <a href="http://www.boost.org/LICENSE_1_0.txt">http://www.boost.org/LICENSE_1_0.txt</a>)
@@ -12,7 +12,7 @@
     [id conversion]
     [version 1.7]
     [authors [Stroustrup, Bjarne], [Abrahams, Dave], [Rasin, Boris], [Polukhin, Antony]]
-    [copyright 2001 Beman Dawes, 2014-2022 Antony Polukhin]
+    [copyright 2001 Beman Dawes, 2014-2024 Antony Polukhin]
     [license
         Distributed under the Boost Software License, Version 1.0.
         (See accompanying file LICENSE_1_0.txt or copy at
@@ -30,8 +30,7 @@ The Conversion Library improves program safety and clarity by performing
 otherwise messy conversions. It includes cast-style function templates designed 
 to complement the C++ Standard's built-in casts.
 
-To reduce coupling, particularly to standard library IOStreams, 
-the Boost Conversion Library is supplied by several headers:
+To reduce coupling, the Boost Conversion Library is supplied by several headers:
 
 # The [@boost:boost/polymorphic_cast.hpp boost/polymorphic_cast.hpp] header
   provides [link polymorphic_cast `polymorphic_cast<>`] and
@@ -42,8 +41,6 @@ the Boost Conversion Library is supplied by several headers:
   [link polymorphic_pointer_cast `polymorphic_pointer_downcast<>`]
 # The [@boost:boost/implicit_cast.hpp boost/implicit_cast.hpp] header provides `implicit_cast<>` 
   to perform implicit casts only (no down-cast, no void*->T*, no U->T if T has only explicit constructors for U).
-# The [@boost:boost/lexical_cast.hpp boost/lexical_cast.hpp] header 
-  provides [@boost:doc/libs/release/libs/lexical_cast/ `lexical_cast<>`] general literal text conversions, such as an `int` represented as a `string`, or vice-versa. 
 
 [endsect]
 

include/boost/implicit_cast.hpp

@@ -28,7 +28,7 @@ template<class T> struct icast_identity
 // The use of identity creates a non-deduced form, so that the
 // explicit template argument must be supplied
 template <typename T>
-BOOST_CONSTEXPR inline T implicit_cast (typename boost::detail::icast_identity<T>::type x) {
+constexpr T implicit_cast (typename boost::detail::icast_identity<T>::type x) {
     return x;
 }
 

include/boost/polymorphic_cast.hpp

@@ -49,20 +49,18 @@
 #ifndef BOOST_POLYMORPHIC_CAST_HPP
 #define BOOST_POLYMORPHIC_CAST_HPP
 
-# include <boost/config.hpp>
+#include <boost/config.hpp>
 
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #   pragma once
 #endif
 
 # include <boost/assert.hpp>
-# include <boost/core/addressof.hpp>
-# include <boost/core/enable_if.hpp>
 # include <boost/throw_exception.hpp>
-# include <boost/type_traits/is_reference.hpp> 
-# include <boost/type_traits/remove_reference.hpp>
 
+# include <memory>  // std::addressof
 # include <typeinfo>
+# include <type_traits>
 
 namespace boost
 {
@@ -111,13 +109,13 @@ namespace boost
     //  Contributed by Julien Delacroix
 
     template <class Target, class Source>
-    inline typename boost::enable_if_c<
-        boost::is_reference<Target>::value, Target
+    inline typename std::enable_if<
+        std::is_reference<Target>::value, Target
     >::type polymorphic_downcast(Source& x)
     {
-        typedef typename boost::remove_reference<Target>::type* target_pointer_type;
+        typedef typename std::remove_reference<Target>::type* target_pointer_type;
         return *boost::polymorphic_downcast<target_pointer_type>(
-            boost::addressof(x)
+            std::addressof(x)
         );
     }
 

include/boost/polymorphic_pointer_cast.hpp

@@ -1,6 +1,6 @@
 //  boost polymorphic_pointer_cast.hpp header file  ----------------------------------------------//
 //  (C) Copyright Boris Rasin, 2014-2021.
-//  (C) Copyright Antony Polukhin, 2014-2022.
+//  (C) Copyright Antony Polukhin, 2014-2024.
 //  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)
@@ -10,19 +10,16 @@
 #ifndef BOOST_CONVERSION_POLYMORPHIC_POINTER_CAST_HPP
 #define BOOST_CONVERSION_POLYMORPHIC_POINTER_CAST_HPP
 
-# include <boost/config.hpp>
-# include <boost/assert.hpp>
-# include <boost/pointer_cast.hpp>
-# include <boost/throw_exception.hpp>
-# include <boost/utility/declval.hpp>
-# ifdef BOOST_NO_CXX11_DECLTYPE
-#   include <boost/typeof/typeof.hpp>
-# endif
-
+#include <boost/config.hpp>
 #ifdef BOOST_HAS_PRAGMA_ONCE
 #   pragma once
 #endif
 
+# include <boost/assert.hpp>
+# include <boost/pointer_cast.hpp>
+# include <boost/throw_exception.hpp>
+
+
 namespace boost
 {
 //  See the documentation for descriptions of how to choose between
@@ -41,36 +38,20 @@ namespace boost
 
     //  Contributed by Boris Rasin
 
-    namespace detail
-    {
-        template <typename Target, typename Source>
-        struct dynamic_pointer_cast_result
-        {
-#ifdef BOOST_NO_CXX11_DECLTYPE
-            BOOST_TYPEOF_NESTED_TYPEDEF_TPL(nested, dynamic_pointer_cast<Target>(boost::declval<Source>()))
-            typedef typename nested::type type;
-#else
-            typedef decltype(dynamic_pointer_cast<Target>(boost::declval<Source>())) type;
-#endif
-        };
-    }
-
     template <typename Target, typename Source>
-    inline typename detail::dynamic_pointer_cast_result<Target, Source>::type
-    polymorphic_pointer_downcast (const Source& x)
+    inline auto polymorphic_pointer_downcast (const Source& x)
+        -> decltype(static_pointer_cast<Target>(x))
     {
         BOOST_ASSERT(dynamic_pointer_cast<Target> (x) == x);
         return static_pointer_cast<Target> (x);
     }
 
     template <typename Target, typename Source>
-    inline typename detail::dynamic_pointer_cast_result<Target, Source>::type
-    polymorphic_pointer_cast (const Source& x)
+    inline auto polymorphic_pointer_cast (const Source& x)
+        -> decltype(dynamic_pointer_cast<Target>(x))
     {
-        typename detail::dynamic_pointer_cast_result<Target, Source>::type tmp
-            = dynamic_pointer_cast<Target> (x);
+        auto tmp = dynamic_pointer_cast<Target> (x);
         if ( !tmp ) boost::throw_exception( std::bad_cast() );
-
         return tmp;
     }
 

index.html

@@ -3,16 +3,18 @@
  Copyright (c) 2016 Mikhail Maximov
  vigorous.activity at gmail dot com
 
- Copyright (c) Antony Polukhin, 2021-2022
+ Copyright (c) Antony Polukhin, 2021-2024
 
  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)
+
+boost-no-inspect
 -->
 <html>
 <head>
 <meta charset="utf-8">
-<meta http-equiv="refresh" content="0; url=https://www.boost.org/doc/libs/master/doc/html/conversion.html">
+<meta http-equiv="refresh" content="0; url=../../doc/html/conversion.html">
 <title>Boost.Conversion</title>
 <style>
   body {
@@ -28,10 +30,10 @@
 <body>
   <p>
     Automatic redirection failed, please go to
-    <a href="https://www.boost.org/doc/libs/master/doc/html/conversion.html">https://www.boost.org/doc/libs/master/doc/html/conversion.html</a>
+    <a href="../../doc/html/conversion.html">../../doc/html/conversion.html</a>
   </p>
   <p>
-    &copy; Antony Polukhin, 2014-2022
+    &copy; Antony Polukhin, 2014-2024
   </p>
 </body>
 </html>

meta/libraries.json

@@ -12,5 +12,5 @@
     "maintainers": [
         "Antony Polukhin <antoshkka -at- gmail.com>"
     ],
-    "cxxstd": "03"
+    "cxxstd": "11"
 }

test/Jamfile.v2

@@ -1,18 +1,20 @@
 # Copyright (C) 2001-2003 Douglas Gregor
-# Copyright (C) Antony Polukhin, 2011-2022
+# Copyright (C) Antony Polukhin, 2011-2024
 #
 # 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)
 #
 
+require-b2 5.0.1 ;
+import-search /boost/config/checks ;
+import config : requires ;
 import testing ;
 import feature ;
 
 project
     : requirements
-        <toolset>gcc-4.7:<cxxflags>-ftrapv
-        <toolset>gcc-4.6:<cxxflags>-ftrapv
-        <toolset>clang:<cxxflags>-ftrapv
+        <library>/boost/conversion//boost_conversion
+        [ requires cxx11_decltype ]
         # default to all warnings on:
         <warnings>all
         # set warnings as errors for those compilers we know we get warning free:

test/appveyor.yml

@@ -2,7 +2,7 @@
 # subject to 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)
 #
-# Copyright Antony Polukhin, 2016-2022.
+# Copyright Antony Polukhin, 2016-2024.
 
 #
 # See https://svn.boost.org/trac/boost/wiki/TravisCoverals for description of this file
@@ -21,7 +21,7 @@ init:
 # From this point and below code is same for all the Boost libs
 ###############################################################################################################
 
-version: 1.71.{build}-{branch}
+version: 1.84.{build}-{branch}
  
 # branches to build
 branches:
@@ -32,9 +32,6 @@ skip_tags: true
 
 environment:
   matrix:
-    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
-      TOOLSET: msvc-9.0,msvc-10.0,msvc-11.0,msvc-12.0
-      ADDRMD: 32
     - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
       TOOLSET: msvc-14.1,clang-win
       CXXSTD: 14,17

test/implicit_cast.cpp

@@ -35,7 +35,7 @@ int main()
     (void)z;
 
 
-    BOOST_CONSTEXPR long value = boost::implicit_cast<long>(42);
+    constexpr long value = boost::implicit_cast<long>(42);
     BOOST_TEST(value == 42L);
 
     return boost::report_errors();

test/polymorphic_cast_test.cpp

@@ -6,6 +6,7 @@
 // Copyright 1999 Dave Abrahams
 // Copyright 2014 Peter Dimov
 // Copyright 2014 Boris Rasin, Antony Polukhin
+// Copyright 2023 Antony Polukhin
 //
 // Distributed under the Boost Software License, Version 1.0.
 //
@@ -237,8 +238,6 @@ static void test_polymorphic_pointer_downcast_intrusive()
     }
 }
 
-#ifndef BOOST_NO_CXX11_SMART_PTR
-
 static void test_polymorphic_pointer_downcast_std_shared()
 {
     std::shared_ptr<Base> base (new Derived);
@@ -253,8 +252,6 @@ static void test_polymorphic_pointer_downcast_std_shared()
     }
 }
 
-#endif
-
 static void test_polymorphic_cast_fail()
 {
     Base * base = new Base;
@@ -272,9 +269,7 @@ static void test_polymorphic_pointer_cast_fail()
 
     BOOST_TEST_THROWS( boost::polymorphic_pointer_cast<Derived>( boost::shared_ptr<Base>(new Base) ), std::bad_cast );
 
-#ifndef BOOST_NO_CXX11_SMART_PTR
     BOOST_TEST_THROWS( boost::polymorphic_pointer_cast<Derived>( std::shared_ptr<Base>(new Base) ), std::bad_cast );
-#endif
 
     BOOST_TEST_THROWS( boost::polymorphic_pointer_cast<Derived>( boost::intrusive_ptr<Base>(new Base) ), std::bad_cast );
 }
@@ -337,7 +332,6 @@ static void test_polymorphic_pointer_downcast_boost_shared_fail()
     expect_assertion = false;
 }
 
-#ifndef BOOST_NO_CXX11_SMART_PTR
 
 static void test_polymorphic_pointer_downcast_std_shared_fail()
 {
@@ -352,7 +346,6 @@ static void test_polymorphic_pointer_downcast_std_shared_fail()
     expect_assertion = false;
 }
 
-#endif
 
 static void test_polymorphic_pointer_downcast_intrusive_fail()
 {
@@ -382,10 +375,9 @@ int main()
     test_polymorphic_pointer_downcast_boost_shared_fail();
     test_polymorphic_pointer_downcast_intrusive_fail();
 
-#ifndef BOOST_NO_CXX11_SMART_PTR
     test_polymorphic_pointer_downcast_std_shared();
     test_polymorphic_pointer_downcast_std_shared_fail();
-#endif
+
 
     return boost::report_errors();
 }