Skip to content

Commit 8d02da7

Browse files
mberk-yilmazmberk-yilmaz
committed
fix: fixed findings and CI build errors.
1 parent edf727b commit 8d02da7

File tree

5 files changed

+40
-14
lines changed

5 files changed

+40
-14
lines changed

‎include/spdlog/common.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,8 +281,6 @@ SPDLOG_CONSTEXPR spdlog::string_view_t SPDLOG_LEVEL_NAME_OFF{"off", 3};
281281
#if !defined(SPDLOG_LEVEL_NAMES)
282282
using level_names_t = std::array<spdlog::string_view_t, n_levels>;
283283

284-
using level_names_value_t = level_names_t::value_type;
285-
286284
#if __cplusplus >= 201703L
287285
SPDLOG_INLINE
288286
#endif
@@ -292,18 +290,20 @@ SPDLOG_CONSTEXPR level_names_t SPDLOG_LEVEL_NAMES{
292290
SPDLOG_LEVEL_NAME_OFF};
293291
#endif
294292

293+
using level_names_value_t = decltype(SPDLOG_LEVEL_NAMES)::value_type;
294+
295295
#if !defined(SPDLOG_SHORT_LEVEL_NAMES)
296296
using short_level_names_t = std::array<const char*, n_levels>;
297297

298-
using level_short_names_value_t = short_level_names_t::value_type;
299-
300298
#if __cplusplus >= 201703L
301299
SPDLOG_INLINE
302300
#endif
303301
SPDLOG_CONSTEXPR short_level_names_t SPDLOG_SHORT_LEVEL_NAMES{"T", "D", "I", "W", "E", "C", "O"};
304302

305303
#endif
306304

305+
using level_short_names_value_t = decltype(SPDLOG_SHORT_LEVEL_NAMES)::value_type;
306+
307307
SPDLOG_API SPDLOG_NODISCARD SPDLOG_INLINE SPDLOG_CONSTEXPR const level_names_value_t& to_string_view(
308308
spdlog::level::level_enum l) SPDLOG_NOEXCEPT {
309309
return SPDLOG_LEVEL_NAMES[l];

‎include/spdlog/details/registry-inl.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@ SPDLOG_INLINE registry::registry()
4747
#endif // SPDLOG_DISABLE_DEFAULT_LOGGER
4848
}
4949

50+
SPDLOG_INLINE registry::~registry() = default;
51+
5052
SPDLOG_INLINE void registry::register_logger(std::shared_ptr<logger> new_logger) {
5153
std::lock_guard<std::mutex> lock(logger_map_mutex_);
5254
register_logger_(std::move(new_logger));

‎include/spdlog/details/registry.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ class SPDLOG_API registry {
102102

103103
private:
104104
registry();
105+
~registry();
105106

106107
void throw_if_exists_(const std::string &logger_name);
107108
void register_logger_(std::shared_ptr<logger> new_logger);

‎include/spdlog/sinks/syslog_sink.h‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,25 @@ namespace spdlog {
1515

1616
namespace details {
1717
using levels_array = std::array<int, 7>;
18+
19+
#if __cplusplus >= 201703L
1820
SPDLOG_INLINE constexpr levels_array syslog_levels_{/* spdlog::level::trace */ LOG_DEBUG,
1921
/* spdlog::level::debug */ LOG_DEBUG,
2022
/* spdlog::level::info */ LOG_INFO,
2123
/* spdlog::level::warn */ LOG_WARNING,
2224
/* spdlog::level::err */ LOG_ERR,
2325
/* spdlog::level::critical */ LOG_CRIT,
2426
/* spdlog::level::off */ LOG_INFO};
27+
#else
28+
static constexpr levels_array syslog_levels_{ /* spdlog::level::trace */ LOG_DEBUG,
29+
/* spdlog::level::debug */ LOG_DEBUG,
30+
/* spdlog::level::info */ LOG_INFO,
31+
/* spdlog::level::warn */ LOG_WARNING,
32+
/* spdlog::level::err */ LOG_ERR,
33+
/* spdlog::level::critical */ LOG_CRIT,
34+
/* spdlog::level::off */ LOG_INFO};
35+
#endif
36+
2537
} // namespace details
2638

2739
namespace sinks {

‎include/spdlog/sinks/systemd_sink.h‎

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ class systemd_sink : public base_sink<Mutex> {
3636
std::string ident_;
3737
bool enable_formatting_ = false;
3838
using levels_array = std::array<int, 7>;
39-
static constexpr levels_array syslog_levels_{/* spdlog::level::trace */ LOG_DEBUG,
40-
/* spdlog::level::debug */ LOG_DEBUG,
41-
/* spdlog::level::info */ LOG_INFO,
42-
/* spdlog::level::warn */ LOG_WARNING,
43-
/* spdlog::level::err */ LOG_ERR,
44-
/* spdlog::level::critical */ LOG_CRIT,
45-
/* spdlog::level::off */ LOG_INFO};
46-
47-
void sink_it_(const details::log_msg &msg) override {
39+
#if __cplusplus >= 201703L
40+
static inline constexpr levels_array syslog_levels_{/* spdlog::level::trace */ LOG_DEBUG,
41+
/* spdlog::level::debug */ LOG_DEBUG,
42+
/* spdlog::level::info */ LOG_INFO,
43+
/* spdlog::level::warn */ LOG_WARNING,
44+
/* spdlog::level::err */ LOG_ERR,
45+
/* spdlog::level::critical */ LOG_CRIT,
46+
/* spdlog::level::off */ LOG_INFO};
47+
#endif
48+
49+
void sink_it_(const details::log_msg& msg) override {
4850
int err;
4951
string_view_t payload;
5052
memory_buf_t formatted;
@@ -92,7 +94,16 @@ class systemd_sink : public base_sink<Mutex> {
9294
}
9395
}
9496

95-
SPDLOG_NODISCARD constexpr int syslog_level(level::level_enum l) const SPDLOG_NOEXCEPT {
97+
SPDLOG_NODISCARD constexpr int syslog_level(level::level_enum l) const {
98+
#if __cplusplus < 201703L
99+
constexpr levels_array syslog_levels_{/* spdlog::level::trace */ LOG_DEBUG,
100+
/* spdlog::level::debug */ LOG_DEBUG,
101+
/* spdlog::level::info */ LOG_INFO,
102+
/* spdlog::level::warn */ LOG_WARNING,
103+
/* spdlog::level::err */ LOG_ERR,
104+
/* spdlog::level::critical */ LOG_CRIT,
105+
/* spdlog::level::off */ LOG_INFO};
106+
#endif
96107
return syslog_levels_.at(static_cast<levels_array::size_type>(l));
97108
}
98109

0 commit comments

Comments
 (0)