From 8cb06e5d821d6a44357dc06883485c17954b2493 Mon Sep 17 00:00:00 2001 From: Peter Dimov Date: Sat, 5 Feb 2022 00:06:29 +0200 Subject: [PATCH] Remove srcloc_strip_top_level, because the contents of __PRETTY_FUNCTION__ aren't constant before GCC 9 and strcmp fails --- include/boost/assert/source_location.hpp | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/include/boost/assert/source_location.hpp b/include/boost/assert/source_location.hpp index 31a2107..1c539bb 100644 --- a/include/boost/assert/source_location.hpp +++ b/include/boost/assert/source_location.hpp @@ -123,20 +123,6 @@ template std::basic_ostream & operator<<( std::basic_ost return os; } -#if defined(BOOST_GCC) - -namespace detail -{ - -BOOST_CONSTEXPR inline char const* srcloc_strip_top_level( char const* fn ) -{ - return std::strcmp( fn, "top level" ) == 0? "": fn; -} - -} // namespace detail - -#endif // #if defined(BOOST_GCC) - } // namespace boost #if defined(BOOST_DISABLE_CURRENT_LOCATION) @@ -165,7 +151,7 @@ BOOST_CONSTEXPR inline char const* srcloc_strip_top_level( char const* fn ) #elif defined(BOOST_GCC) // __PRETTY_FUNCTION__ is allowed outside functions under GCC -# define BOOST_CURRENT_LOCATION ::boost::source_location(__FILE__, __LINE__, ::boost::detail::srcloc_strip_top_level(__PRETTY_FUNCTION__)) +# define BOOST_CURRENT_LOCATION ::boost::source_location(__FILE__, __LINE__, __PRETTY_FUNCTION__) #else