refinements plus workaround for compile-time type name hash computation on older gcc versions

Author: zajo

include/boost/leaf/common.hpp

@@ -6,7 +6,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/leaf/config.hpp>
-#include <boost/leaf/detail/demangle.hpp>
 
 #include <iosfwd>
 #include <cerrno>

include/boost/leaf/detail/demangle.hpp

@@ -182,7 +182,7 @@ namespace n
         // Unrecognized __PRETTY_FUNCTION__/__FUNCSIG__ formats will result in compiler diagnostics.
         // In that case, please file an issue on https://github.com/boostorg/leaf.
 
-#define BOOST_LEAF_P(P) (sizeof(char[1 + detail::check_prefix(BOOST_LEAF_PRETTY_FUNCTION, P)]) - 1)
+#define BOOST_LEAF_P(P) (sizeof(char[1 + detail::check_prefix(BOOST_LEAF_PRETTY_FUNCTION, (P))]) - 1)
         // clang style:
         std::size_t const p01 = BOOST_LEAF_P("r boost::leaf::n::p() [T = ");
         std::size_t const p02 = BOOST_LEAF_P("r __cdecl boost::leaf::n::p(void) [T = ");
@@ -216,7 +216,7 @@ namespace n
         std::size_t const p24 = BOOST_LEAF_P("struct boost::leaf::n::r __fastcall boost::leaf::n::p<");
 #undef BOOST_LEAF_P
 
-#define BOOST_LEAF_S(S) (sizeof(char[1 + detail::check_suffix(BOOST_LEAF_PRETTY_FUNCTION, S)]) - 1)
+#define BOOST_LEAF_S(S) (sizeof(char[1 + detail::check_suffix(BOOST_LEAF_PRETTY_FUNCTION, (S))]) - 1)
         // clang/gcc style:
         std::size_t const s01 = BOOST_LEAF_S("]");
         // msvc style:
@@ -234,14 +234,16 @@ namespace n
         ) * 2 - 1];
         (void) static_assert_unrecognized_pretty_function_format_please_file_github_issue;
 
+#define BOOST_LEAF_COMPUTE_TYPE_HASH(P, S) detail::compute_hash<sizeof(char[(1 + (P))]) - 1, sizeof(char[(1 + (S))]) - 1>(BOOST_LEAF_PRETTY_FUNCTION)
         if( std::size_t const p = sizeof(char[1 + !!s01 * (p01 + p02 + p03 + p04 + p05 + p06 + p07 + p08 + p09 + p10 + p11 + p12)]) - 1 )
-            return { BOOST_LEAF_PRETTY_FUNCTION + p, s01 - p, detail::compute_hash<p, s01>(BOOST_LEAF_PRETTY_FUNCTION) };
+            return { BOOST_LEAF_PRETTY_FUNCTION + p, s01 - p, BOOST_LEAF_COMPUTE_TYPE_HASH(p, s01) };
 
         if( std::size_t const p = sizeof(char[1 + !!s02 * (p13 + p14 + p15 + p16 + p17 + p18 + p19 + p20 + p21)]) - 1 )
-            return { BOOST_LEAF_PRETTY_FUNCTION + p, s02 - p, detail::compute_hash<p, s02>(BOOST_LEAF_PRETTY_FUNCTION) };
+            return { BOOST_LEAF_PRETTY_FUNCTION + p, s02 - p, BOOST_LEAF_COMPUTE_TYPE_HASH(p, s02) };
 
-        std::size_t const p = sizeof(char[1 + !!s02 * (p22 + p23 + p24)]) - 1; // p is not zero, we've static asserted the hell out of it
-        return { BOOST_LEAF_PRETTY_FUNCTION + p, s02 - p, detail::compute_hash<p, s02>(BOOST_LEAF_PRETTY_FUNCTION) };
+        std::size_t const p = sizeof(char[1 + !!s02 * (p22 + p23 + p24)]) - 1;
+        return { BOOST_LEAF_PRETTY_FUNCTION + p, s02 - p, BOOST_LEAF_COMPUTE_TYPE_HASH(p, s02) };
+#undef BOOST_LEAF_COMPUTE_TYPE_HASH
     }
 } // namespace n
 

include/boost/leaf/detail/exception_base.hpp

@@ -5,6 +5,7 @@
 // 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)
 
+#include <boost/leaf/config.hpp>
 #include <boost/leaf/detail/demangle.hpp>
 
 namespace boost { namespace leaf {

include/boost/leaf/detail/function_traits.hpp

@@ -5,6 +5,7 @@
 // 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)
 
+#include <boost/leaf/config.hpp>
 #include <boost/leaf/detail/mp11.hpp>
 
 #include <tuple>

include/boost/leaf/error.hpp

@@ -11,8 +11,6 @@
 #include <boost/leaf/detail/capture_list.hpp>
 #include <boost/leaf/serialization/diagnostics_writer.hpp>
 
-#include <cstring>
-
 #if BOOST_LEAF_CFG_STD_SYSTEM_ERROR
 #   include <system_error>
 #endif

include/boost/leaf/serialization/diagnostics_writer.hpp

@@ -5,6 +5,7 @@
 // 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)
 
+#include <boost/leaf/config.hpp>
 #include <boost/leaf/serialization/writer.hpp>
 #include <boost/leaf/detail/exception_base.hpp>
 

include/boost/leaf/serialization/json_writer.hpp

@@ -5,6 +5,7 @@
 // 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)
 
+#include <boost/leaf/config.hpp>
 #include <boost/leaf/serialization/writer.hpp>
 #include <boost/leaf/detail/exception_base.hpp>
 #include <boost/leaf/error.hpp>

include/boost/leaf/serialization/writer.hpp

@@ -5,6 +5,7 @@
 // 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)
 
+#include <boost/leaf/config.hpp>
 #include <boost/leaf/detail/demangle.hpp>
 
 #include <type_traits>
@@ -37,14 +38,14 @@ class writer
     {
         return type_ == parse<typename std::decay<Derived>::type>() ? static_cast<Derived *>(this) : nullptr;
     }
-}; // class writer
+};
 
-template <class W, class E>
-typename std::enable_if<std::is_base_of<writer, W>::value>::type
-serialize(W &, E const &)
-{
+    template <class W, class E>
+    typename std::enable_if<std::is_base_of<writer, W>::value>::type
+    serialize(W &, E const &)
+    {
+    }
 }
-} // namespace serialization
 
 namespace detail
 {
@@ -53,7 +54,7 @@ namespace detail
     {
         using type = serialization::writer;
     };
-} // namespace detail
+}
 
 } } // namespace boost::leaf
 

test/diagnostics_test6.cpp

@@ -7,7 +7,6 @@
 #else
 #   include <boost/leaf/config.hpp>
 #   include <boost/leaf/diagnostics.hpp>
-#   include <boost/leaf/on_error.hpp>
 #   include <boost/leaf/result.hpp>
 #endif
 

test/error_code_test.cpp

@@ -19,7 +19,6 @@ int main()
 #ifdef BOOST_LEAF_TEST_SINGLE_HEADER
 #   include "leaf.hpp"
 #else
-#   include <boost/leaf/diagnostics.hpp>
 #   include <boost/leaf/pred.hpp>
 #   include <boost/leaf/result.hpp>
 #endif