Skip to content

Using std::source_location. #2667

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

Open
wants to merge 7 commits into
base: v1.x
Choose a base branch
from
Open

Using std::source_location. #2667

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d8ffb37
Starting experimenting with std::source_location.
gian21391 Mar 7, 2023
74d3a59
Managing WCHAR=ON case.
gian21391 Mar 8, 2023
d5f4d79
Include source_location only after checking if source_location exists…
gian21391 Mar 9, 2023
9400579
Reverting tests.
gian21391 Mar 9, 2023
8ae7e4d
Added C++ standard check before including <source_location>.
gian21391 Mar 9, 2023
e950911
Added tests for log functions.
gian21391 Mar 10, 2023
aa6f732
Added support also for spdlog::log functions.
gian21391 Mar 10, 2023
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
31 changes: 31 additions & 0 deletions include/spdlog/logger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,13 @@

#include <vector>

#ifdef __has_include
# if __has_include(<source_location>) && __cplusplus >= 202002L
# include <source_location>
# define SPDLOG_SOURCE_LOCATION
# endif
#endif

#ifndef SPDLOG_NO_EXCEPTIONS
# define SPDLOG_LOGGER_CATCH(location) \
catch (const std::exception &ex) \
Expand Down Expand Up @@ -90,6 +97,14 @@ class SPDLOG_API logger
log_(loc, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
}

#ifdef SPDLOG_SOURCE_LOCATION
template<typename... Args>
void log(std::source_location loc, level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
{
log_(spdlog::source_loc{loc.file_name(), static_cast<int>(loc.line()), loc.function_name()}, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
}
#endif

template<typename... Args>
void log(level::level_enum lvl, format_string_t<Args...> fmt, Args &&... args)
{
Expand All @@ -109,6 +124,14 @@ class SPDLOG_API logger
log(loc, lvl, "{}", msg);
}

#ifdef SPDLOG_SOURCE_LOCATION
template<typename T>
void log(std::source_location loc, level::level_enum lvl, const T &msg)
{
log(spdlog::source_loc{loc.file_name(), static_cast<int>(loc.line()), loc.function_name()}, lvl, msg);
}
#endif

void log(log_clock::time_point log_time, source_loc loc, level::level_enum lvl, string_view_t msg)
{
bool log_enabled = should_log(lvl);
Expand Down Expand Up @@ -183,6 +206,14 @@ class SPDLOG_API logger
log_(loc, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
}

# ifdef SPDLOG_SOURCE_LOCATION
template<typename... Args>
void log(std::source_location loc, level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&... args)
{
log_(spdlog::source_loc{loc.file_name(), static_cast<int>(loc.line()), loc.function_name()}, lvl, details::to_string_view(fmt), std::forward<Args>(args)...);
}
# endif

template<typename... Args>
void log(level::level_enum lvl, wformat_string_t<Args...> fmt, Args &&... args)
{
Expand Down
Loading