Avoid -Wundef warnings

Revert "Don't double-rethrow std::exception_ptr (#53 )"
This reverts commit ea70868a45.
2024-01-06 16:30:15 +02:00 · 2023-08-06 15:20:29 -07:00
14 changed files with 38 additions and 46 deletions
--- a/include/boost/exception/current_exception_cast.hpp
+++ b/include/boost/exception/current_exception_cast.hpp
@ -7,7 +7,7 @@
 #define BOOST_EXCEPTION_7E83C166200811DE885E826156D89593

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/clone_current_exception.hpp
+++ b/include/boost/exception/detail/clone_current_exception.hpp
@ -7,7 +7,7 @@
 #define BOOST_EXCEPTION_81522C0EB56511DFAB613DB0DFD72085

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/error_info_impl.hpp
+++ b/include/boost/exception/detail/error_info_impl.hpp
@ -14,7 +14,7 @@
 #include <string>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/exception_ptr.hpp
+++ b/include/boost/exception/detail/exception_ptr.hpp
@ -26,7 +26,7 @@
 #include <stdlib.h>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
@ -44,48 +44,27 @@ boost
    exception_detail
        {
 #ifndef BOOST_NO_CXX11_HDR_EXCEPTION
-        class
-        BOOST_SYMBOL_VISIBLE
-        std_exception_ptr_clone_impl:
-            public virtual clone_base
+        struct
+        std_exception_ptr_wrapper:
+            std::exception
            {
-            std::exception_ptr p_;
-
-            public:
-
-            explicit std_exception_ptr_clone_impl( std::exception_ptr const & ptr ) BOOST_NOEXCEPT:
-                p_(ptr)
+            std::exception_ptr p;
+            explicit std_exception_ptr_wrapper( std::exception_ptr const & ptr ) BOOST_NOEXCEPT:
+                p(ptr)
                {
                }
-
-            ~std_exception_ptr_clone_impl() BOOST_NOEXCEPT_OR_NOTHROW
+#ifndef BOOST_NO_CXX11_RVALUE_REFERENCES
+            explicit std_exception_ptr_wrapper( std::exception_ptr && ptr ) BOOST_NOEXCEPT:
+                p(static_cast<std::exception_ptr &&>(ptr))
                {
                }
-
-            private:
-
-            std_exception_ptr_clone_impl( std_exception_ptr_clone_impl const & x ):
-                p_(x.p_)
-                {
-                }
-
-            clone_base const*
-            clone() const
-                {
-                return new std_exception_ptr_clone_impl(*this);
-                }
-
-            void
-            rethrow() const
-                {
-                std::rethrow_exception(p_);
-                }
+#endif
            };
        shared_ptr<exception_detail::clone_base const>
        inline
        wrap_exception_ptr( std::exception_ptr const & e )
            {
-            exception_detail::clone_base const & base = std_exception_ptr_clone_impl(e);
+            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
@ -557,7 +536,20 @@ boost
        rethrow_exception_( exception_ptr const & p )
            {
            BOOST_ASSERT(p);
+#if defined( BOOST_NO_CXX11_HDR_EXCEPTION ) || defined( BOOST_NO_EXCEPTIONS )
            p.ptr_->rethrow();
+#else
+            try
+                {
+                p.ptr_->rethrow();
+                }
+            catch(
+            std_exception_ptr_wrapper const & wrp)
+                {
+                // if an std::exception_ptr was wrapped above then rethrow it
+                std::rethrow_exception(wrp.p);
+                }
+#endif
            }
        }

--- a/include/boost/exception/detail/is_output_streamable.hpp
+++ b/include/boost/exception/detail/is_output_streamable.hpp
@ -9,7 +9,7 @@
 #include <ostream>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/object_hex_dump.hpp
+++ b/include/boost/exception/detail/object_hex_dump.hpp
@ -14,7 +14,7 @@
 #include <cstdlib>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/detail/type_info.hpp
+++ b/include/boost/exception/detail/type_info.hpp
@ -14,7 +14,7 @@
 #include <string.h>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/diagnostic_information.hpp
+++ b/include/boost/exception/diagnostic_information.hpp
@ -21,7 +21,7 @@
 #endif

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/errinfo_errno.hpp
+++ b/include/boost/exception/errinfo_errno.hpp
@ -11,7 +11,7 @@
 #include <string.h>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/get_error_info.hpp
+++ b/include/boost/exception/get_error_info.hpp
@ -14,7 +14,7 @@
 #include <boost/assert.hpp>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/info.hpp
+++ b/include/boost/exception/info.hpp
@ -14,7 +14,7 @@
 #include <map>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/info_tuple.hpp
+++ b/include/boost/exception/info_tuple.hpp
@ -10,7 +10,7 @@
 #include <boost/tuple/tuple.hpp>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/to_string.hpp
+++ b/include/boost/exception/to_string.hpp
@ -11,7 +11,7 @@
 #include <sstream>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
--- a/include/boost/exception/to_string_stub.hpp
+++ b/include/boost/exception/to_string_stub.hpp
@ -11,7 +11,7 @@
 #include <boost/assert.hpp>

 #ifndef BOOST_EXCEPTION_ENABLE_WARNINGS
-#if __GNUC__*100+__GNUC_MINOR__>301
+#if defined(__GNUC__) && __GNUC__*100+__GNUC_MINOR__>301
 #pragma GCC system_header
 #endif
 #ifdef __clang__
Author	SHA1	Message	Date
Peter Dimov	ad15fefae7	Avoid -Wundef warnings	2024-01-06 16:30:15 +02:00
Emil Dotchevski	11f102a987	Revert "Don't double-rethrow std::exception_ptr (#53 )" This reverts commit `ea70868a45`.	2023-08-06 15:20:29 -07:00