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

fix: check std::source_location::file_name result

Browse Source 
encountered an error with nullptr from std::source_location::file_name
This commit is contained in:
ToruNiina
2024-11-26 02:42:51 +09:00
parent 7f6c574ff5
commit 8fcb759694
1 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/toml11/compat.hpp
View File

@@ -434,9 +434,19 @@ using source_location = std::source_location;
inline std::string to_string(const source_location& loc) inline std::string to_string(const source_location& loc)
{ {
return std::string(" at line ") + std::to_string(loc.line()) + const char* fname = loc.file_name();
std::string(" in file ") + std::string(loc.file_name()); if(fname)
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in file ") + std::string(fname);
}
else
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in unknown file");
}
} }
} // cxx } // cxx
} // toml } // toml
#elif defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION) #elif defined(TOML11_HAS_EXPERIMENTAL_SOURCE_LOCATION)
@@ -449,9 +459,19 @@ using source_location = std::experimental::source_location;
inline std::string to_string(const source_location& loc) inline std::string to_string(const source_location& loc)
{ {
return std::string(" at line ") + std::to_string(loc.line()) + const char* fname = loc.file_name();
std::string(" in file ") + std::string(loc.file_name()); if(fname)
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in file ") + std::string(fname);
}
else
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in unknown file");
}
} }
} // cxx } // cxx
} // toml } // toml
#elif defined(TOML11_HAS_BUILTIN_FILE_LINE) #elif defined(TOML11_HAS_BUILTIN_FILE_LINE)
@@ -483,9 +503,19 @@ struct source_location
inline std::string to_string(const source_location& loc) inline std::string to_string(const source_location& loc)
{ {
return std::string(" at line ") + std::to_string(loc.line()) + const char* fname = loc.file_name();
std::string(" in file ") + std::string(loc.file_name()); if(fname)
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in file ") + std::string(fname);
}
else
{
return std::string(" at line ") + std::to_string(loc.line()) +
std::string(" in unknown file");
}
} }
} // cxx } // cxx
} // toml } // toml
#else // no builtin #else // no builtin