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

Change file_name() and function_name() for source_location() to return '' instead of '(unknown)'

Browse Source
This commit is contained in:
Peter Dimov
2022-02-03 06:56:39 +02:00
parent 65068b2b9a
commit 0e99024312
5 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/changes.adoc
View File

@ -10,6 +10,11 @@ http://www.boost.org/LICENSE_1_0.txt
:toc-title: :toc-title:
:idprefix: :idprefix:
## Changes in 1.79.0
* `source_location().file_name()` and `source_location().function_name()`
now return `""` instead of `"(unknown)"`.
## Changes in 1.78.0 ## Changes in 1.78.0
* Added `source_location::to_string`. * Added `source_location::to_string`.

3
doc/source_location.adoc
View File

@ -57,8 +57,7 @@ constexpr source_location() noexcept;
``` ```
Effects: :: Constructs a `source_location` object for which `file_name()` Effects: :: Constructs a `source_location` object for which `file_name()`
and `function_name()` return `"(unknown)"`, and `line()` and `column()` and `function_name()` return `""`, and `line()` and `column()` return `0`.
return `0`.
``` ```
constexpr source_location(char const* file, uint_least32_t line, constexpr source_location(char const* file, uint_least32_t line,

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

@ -28,7 +28,7 @@ private:
public: public:
BOOST_CONSTEXPR source_location() BOOST_NOEXCEPT: file_( "(unknown)" ), function_( "(unknown)" ), line_( 0 ), column_( 0 ) BOOST_CONSTEXPR source_location() BOOST_NOEXCEPT: file_( "" ), function_( "" ), line_( 0 ), column_( 0 )
{ {
} }

5
test/source_location_test.cpp
View File

@ -10,8 +10,8 @@ int main()
{ {
boost::source_location loc; boost::source_location loc;
BOOST_TEST_CSTR_EQ( loc.file_name(), "(unknown)" ); BOOST_TEST_CSTR_EQ( loc.file_name(), "" );
BOOST_TEST_CSTR_EQ( loc.function_name(), "(unknown)" ); BOOST_TEST_CSTR_EQ( loc.function_name(), "" );
BOOST_TEST_EQ( loc.line(), 0 ); BOOST_TEST_EQ( loc.line(), 0 );
BOOST_TEST_EQ( loc.column(), 0 ); BOOST_TEST_EQ( loc.column(), 0 );
} }
@ -19,7 +19,6 @@ 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_CSTR_EQ( loc.function_name(), BOOST_CURRENT_FUNCTION );
BOOST_TEST_EQ( loc.line(), 20 ); BOOST_TEST_EQ( loc.line(), 20 );

9
test/source_location_test2.cpp
View File

@ -12,8 +12,8 @@ int main()
{ {
boost::source_location loc; boost::source_location loc;
BOOST_TEST_CSTR_EQ( loc.file_name(), "(unknown)" ); BOOST_TEST_CSTR_EQ( loc.file_name(), "" );
BOOST_TEST_CSTR_EQ( loc.function_name(), "(unknown)" ); BOOST_TEST_CSTR_EQ( loc.function_name(), "" );
BOOST_TEST_EQ( loc.line(), 0 ); BOOST_TEST_EQ( loc.line(), 0 );
BOOST_TEST_EQ( loc.column(), 0 ); BOOST_TEST_EQ( loc.column(), 0 );
} }
@ -21,9 +21,8 @@ int main()
{ {
boost::source_location loc = BOOST_CURRENT_LOCATION; boost::source_location loc = BOOST_CURRENT_LOCATION;
BOOST_TEST_CSTR_EQ( loc.file_name(), "" );
BOOST_TEST_CSTR_EQ( loc.file_name(), "(unknown)" ); BOOST_TEST_CSTR_EQ( loc.function_name(), "" );
BOOST_TEST_CSTR_EQ( loc.function_name(), "(unknown)" );
BOOST_TEST_EQ( loc.line(), 0 ); BOOST_TEST_EQ( loc.line(), 0 );
BOOST_TEST_EQ( loc.column(), 0 ); BOOST_TEST_EQ( loc.column(), 0 );
} }