Issue #49

CMakeLists.txt

@@ -2,8 +2,6 @@
 # Distributed under the Boost Software License, Version 1.0.
 # https://www.boost.org/LICENSE_1_0.txt
 
-if(NOT DEFINED IDF_TARGET)
-
 cmake_minimum_required(VERSION 3.5...3.20)
 
 project(boost_exception VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
@@ -32,26 +30,3 @@ if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
   add_subdirectory(test)
 
 endif()
-
-else()
-
-FILE(GLOB_RECURSE headers include/*.h include/*.hpp)
-
-idf_component_register(
-    SRCS
-        ${headers}
-#        src/clone_current_exception_non_intrusive.cpp
-    INCLUDE_DIRS
-        include
-    REQUIRES
-        boost_assert
-        boost_config
-        boost_core
-        boost_smart_ptr
-        boost_throw_exception
-        boost_tuple
-        boost_type_traits
-)
-
-endif()
-

include/boost/exception/detail/exception_ptr.hpp

@@ -64,8 +64,7 @@ boost
         inline
         wrap_exception_ptr( std::exception_ptr const & e )
             {
-            exception_detail::clone_base const & base =
-                boost::enable_current_exception(std_exception_ptr_wrapper(std::current_exception()));
+            exception_detail::clone_base const & base = boost::enable_current_exception(std_exception_ptr_wrapper(e));
             return shared_ptr<exception_detail::clone_base const>(base.clone());
             }
 #endif

include/boost/exception/diagnostic_information.hpp

@@ -9,7 +9,7 @@
 #include <boost/config.hpp>
 #include <boost/exception/get_error_info.hpp>
 #include <boost/exception/info.hpp>
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #ifndef BOOST_NO_RTTI
 #include <boost/core/demangle.hpp>
 #endif
@@ -149,11 +149,11 @@ boost
                     if( f )
                         {
                         tmp << *f;
-                        if( int const * l=get_error_info<throw_line>(*be) )
+                        if( l )
                             tmp << '(' << *l << "): ";
                         }
                     tmp << "Throw in function ";
-                    if( char const * const * fn=get_error_info<throw_function>(*be) )
+                    if( fn )
                         tmp << *fn;
                     else
                         tmp << "(unknown)";

include/boost/exception/to_string.hpp

@@ -6,7 +6,7 @@
 #ifndef BOOST_EXCEPTION_7E48761AD92811DC9011477D56D89593
 #define BOOST_EXCEPTION_7E48761AD92811DC9011477D56D89593
 
-#include <boost/utility/enable_if.hpp>
+#include <boost/core/enable_if.hpp>
 #include <boost/exception/detail/is_output_streamable.hpp>
 #include <sstream>