Skip to content

Add constructor to spdlog::source_loc using std::source_location #2979

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
stephanlachnit wants to merge 2 commits into from
Closed

Add constructor to spdlog::source_loc using std::source_location #2979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e33fa1
Always include <version> if available
stephanlachnit Jan 8, 2024
916e542
Add constructor to spdlog::source_loc using std::source_location
stephanlachnit Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 19 additions & 1 deletion include/spdlog/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,13 @@
#include <string>
#include <type_traits>

#ifdef __has_include
#if __has_include(<version>)
#include <version>
#endif
#endif

#ifdef SPDLOG_USE_STD_FORMAT
#include <version>
#if __cpp_lib_format >= 202207L
#include <format>
#else
Expand Down Expand Up @@ -100,6 +105,12 @@
#endif
#endif

// Add constructor to spdlog::source_loc using std::source_location
#if __cpp_lib_source_location >= 201907L
#define SPDLOG_STD_SOURCE_LOCATION
#include <source_location>
#endif

#ifndef SPDLOG_FUNCTION
#define SPDLOG_FUNCTION static_cast<const char *>(__FUNCTION__)
#endif
Expand Down Expand Up @@ -319,6 +330,13 @@ struct source_loc {
line{line_in},
funcname{funcname_in} {}

#ifdef SPDLOG_STD_SOURCE_LOCATION
SPDLOG_CONSTEXPR source_loc(const std::source_location& loc)
: filename{loc.file_name()},
line{static_cast<int>(loc.line())},
funcname{loc.function_name()} {}
#endif

SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT { return line == 0; }
const char *filename{nullptr};
int line{0};
Expand Down