zhangyiss/toml11
1
0
Fork 0
mirror of https://github.com/ToruNiina/toml11.git synced 2025-09-17 17:58:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: merge branch 'check-source-location-file-name-result'

Browse Source
This commit is contained in:
ToruNiina
2025-01-05 18:34:14 +09:00
parent 12be4e7983 5bea3508c6
commit 0468b76bdc
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
include/toml11/compat.hpp
View File

@@ -433,10 +433,20 @@ namespace cxx
using source_location = std::source_location;
inline std::string to_string(const source_location& loc)
{
const char* fname = loc.file_name();
if(fname)
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in file ") + std::string(loc.file_name());
std::string(" in file ") + std::string(fname);
}
else
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in unknown file");
}
}
} // cxx
} // toml
#elif defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
@@ -448,10 +458,20 @@ namespace cxx
using source_location = std::experimental::source_location;
inline std::string to_string(const source_location& loc)
{
const char* fname = loc.file_name();
if(fname)
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in file ") + std::string(loc.file_name());
std::string(" in file ") + std::string(fname);
}
else
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in unknown file");
}
}
} // cxx
} // toml
#elif defined(TOML11_HAS_BUILTIN_FILE_LINE)
@@ -482,10 +502,20 @@ struct source_location
};
inline std::string to_string(const source_location& loc)
{
const char* fname = loc.file_name();
if(fname)
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in file ") + std::string(loc.file_name());
std::string(" in file ") + std::string(fname);
}
else
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in unknown file");
}
}
} // cxx
} // toml
#else // no builtin