feedc0de/boost_assert
1
0
Fork 0
forked from boostorg/assert
Code Pull Requests Activity

Use std::source_location::current() in BOOST_CURRENT_LOCATION

Browse Source
This commit is contained in:
Peter Dimov
2022-02-03 20:28:59 +02:00
parent 8bffbbe5b0
commit 23e699b9a4
3 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/boost/assert/source_location.hpp
View File

@ -118,6 +118,10 @@ template<class E, class T> std::basic_ostream<E, T> & operator<<( std::basic_ost
# define BOOST_CURRENT_LOCATION ::boost::source_location() # define BOOST_CURRENT_LOCATION ::boost::source_location()
#elif defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L
# define BOOST_CURRENT_LOCATION ::boost::source_location(std::source_location::current())
#elif defined(__clang_analyzer__) #elif defined(__clang_analyzer__)
// Cast to char const* to placate clang-tidy // Cast to char const* to placate clang-tidy

7
test/source_location_test.cpp
View File

@ -20,9 +20,14 @@ int main()
boost::source_location loc = BOOST_CURRENT_LOCATION; boost::source_location loc = BOOST_CURRENT_LOCATION;
BOOST_TEST_CSTR_EQ( loc.file_name(), __FILE__ ); BOOST_TEST_CSTR_EQ( loc.file_name(), __FILE__ );
BOOST_TEST_CSTR_EQ( loc.function_name(), BOOST_CURRENT_FUNCTION );
BOOST_TEST_EQ( loc.line(), 20 ); BOOST_TEST_EQ( loc.line(), 20 );
#if !( defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L )
BOOST_TEST_CSTR_EQ( loc.function_name(), BOOST_CURRENT_FUNCTION );
BOOST_TEST_EQ( loc.column(), 0 ); BOOST_TEST_EQ( loc.column(), 0 );
#endif
} }
#if defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L #if defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L

41
test/source_location_test3.cpp
View File

@ -23,17 +23,54 @@ int main()
} }
{ {
boost::source_location loc = BOOST_CURRENT_LOCATION; boost::source_location loc( __FILE__, __LINE__, BOOST_CURRENT_FUNCTION );
BOOST_TEST_EQ( loc.to_string(), std::string( __FILE__ ) + ":26 in function '" + BOOST_CURRENT_FUNCTION + "'" ); BOOST_TEST_EQ( loc.to_string(), std::string( __FILE__ ) + ":26 in function '" + BOOST_CURRENT_FUNCTION + "'" );
} }
{
boost::source_location loc( __FILE__, __LINE__, BOOST_CURRENT_FUNCTION );
std::ostringstream os;
os << loc;
BOOST_TEST_EQ( os.str(), std::string( __FILE__ ) + ":31 in function '" + BOOST_CURRENT_FUNCTION + "'" );
}
{
boost::source_location loc = BOOST_CURRENT_LOCATION;
std::string prefix = std::string( __FILE__ ) + ":40";
#if !( defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L )
BOOST_TEST_EQ( loc.to_string(), prefix + " in function '" + BOOST_CURRENT_FUNCTION + "'" );
#else
// column and function vary when coming from std::source_location::current()
BOOST_TEST_EQ( loc.to_string().substr( 0, prefix.size() ), prefix );
#endif
}
{ {
boost::source_location loc = BOOST_CURRENT_LOCATION; boost::source_location loc = BOOST_CURRENT_LOCATION;
std::ostringstream os; std::ostringstream os;
os << loc; os << loc;
BOOST_TEST_EQ( os.str(), std::string( __FILE__ ) + ":31 in function '" + BOOST_CURRENT_FUNCTION + "'" ); std::string prefix = std::string( __FILE__ ) + ":57";
#if !( defined(__cpp_lib_source_location) && __cpp_lib_source_location >= 201907L )
BOOST_TEST_EQ( os.str(), prefix + " in function '" + BOOST_CURRENT_FUNCTION + "'" );
#else
// column and function vary when coming from std::source_location::current()
BOOST_TEST_EQ( os.str().substr( 0, prefix.size() ), prefix );
#endif
} }
return boost::report_errors(); return boost::report_errors();