diff --git a/include/spdlog/common-inl.h b/include/spdlog/common-inl.h index 728f9831..128537f9 100644 --- a/include/spdlog/common-inl.h +++ b/include/spdlog/common-inl.h @@ -20,17 +20,17 @@ constexpr static const char *short_level_names[] SPDLOG_SHORT_LEVEL_NAMES; -SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +SPDLOG_INLINE const string_view_t &to_string_view(spdlog::level::level_enum l) noexcept { return level_string_views[l]; } -SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT +SPDLOG_INLINE const char *to_short_c_str(spdlog::level::level_enum l) noexcept { return short_level_names[l]; } -SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT +SPDLOG_INLINE spdlog::level::level_enum from_str(const std::string &name) noexcept { auto it = std::find(std::begin(level_string_views), std::end(level_string_views), name); if (it != std::end(level_string_views)) @@ -64,7 +64,7 @@ SPDLOG_INLINE spdlog_ex::spdlog_ex(const std::string &msg, int last_errno) #endif } -SPDLOG_INLINE const char *spdlog_ex::what() const SPDLOG_NOEXCEPT +SPDLOG_INLINE const char *spdlog_ex::what() const noexcept { return msg_.c_str(); } diff --git a/include/spdlog/common.h b/include/spdlog/common.h index dbd0dc7c..7df7e3cd 100644 --- a/include/spdlog/common.h +++ b/include/spdlog/common.h @@ -57,28 +57,6 @@ # define SPDLOG_FMT_STRING(format_string) format_string #endif -// visual studio up to 2013 does not support noexcept nor constexpr -#if defined(_MSC_VER) && (_MSC_VER < 1900) -# define SPDLOG_NOEXCEPT _NOEXCEPT -# define SPDLOG_CONSTEXPR -# define SPDLOG_CONSTEXPR_FUNC inline -#else -# define SPDLOG_NOEXCEPT noexcept -# define SPDLOG_CONSTEXPR constexpr -# if __cplusplus >= 201402L -# define SPDLOG_CONSTEXPR_FUNC constexpr -# else -# define SPDLOG_CONSTEXPR_FUNC inline -# endif -#endif - -#if defined(__GNUC__) || defined(__clang__) -# define SPDLOG_DEPRECATED __attribute__((deprecated)) -#elif defined(_MSC_VER) -# define SPDLOG_DEPRECATED __declspec(deprecated) -#else -# define SPDLOG_DEPRECATED -#endif // disable thread local on msvc 2013 #ifndef SPDLOG_NO_TLS @@ -245,9 +223,9 @@ enum level_enum : int } #endif -SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; -SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) SPDLOG_NOEXCEPT; -SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) SPDLOG_NOEXCEPT; +SPDLOG_API const string_view_t &to_string_view(spdlog::level::level_enum l) noexcept; +SPDLOG_API const char *to_short_c_str(spdlog::level::level_enum l) noexcept; +SPDLOG_API spdlog::level::level_enum from_str(const std::string &name) noexcept; } // namespace level @@ -279,7 +257,7 @@ class SPDLOG_API spdlog_ex : public std::exception public: explicit spdlog_ex(std::string msg); spdlog_ex(const std::string &msg, int last_errno); - const char *what() const SPDLOG_NOEXCEPT override; + const char *what() const noexcept override; private: std::string msg_; @@ -290,14 +268,14 @@ private: struct source_loc { - SPDLOG_CONSTEXPR source_loc() = default; - SPDLOG_CONSTEXPR source_loc(const char *filename_in, int line_in, const char *funcname_in) + constexpr source_loc() = default; + constexpr source_loc(const char *filename_in, int line_in, const char *funcname_in) : filename{filename_in} , line{line_in} , funcname{funcname_in} {} - SPDLOG_CONSTEXPR bool empty() const SPDLOG_NOEXCEPT + constexpr bool empty() const noexcept { return line == 0; } @@ -325,23 +303,23 @@ namespace details { // to_string_view -SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(const memory_buf_t &buf) SPDLOG_NOEXCEPT +constexpr spdlog::string_view_t to_string_view(const memory_buf_t &buf) noexcept { return spdlog::string_view_t{buf.data(), buf.size()}; } -SPDLOG_CONSTEXPR_FUNC spdlog::string_view_t to_string_view(spdlog::string_view_t str) SPDLOG_NOEXCEPT +constexpr spdlog::string_view_t to_string_view(spdlog::string_view_t str) noexcept { return str; } #if defined(SPDLOG_WCHAR_FILENAMES) -SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) SPDLOG_NOEXCEPT +constexpr spdlog::wstring_view_t to_string_view(const wmemory_buf_t &buf) noexcept { return spdlog::wstring_view_t{buf.data(), buf.size()}; } -SPDLOG_CONSTEXPR_FUNC spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) SPDLOG_NOEXCEPT +constexpr spdlog::wstring_view_t to_string_view(spdlog::wstring_view_t str) noexcept { return str; } @@ -355,7 +333,7 @@ inline fmt::basic_string_view to_string_view(fmt::basic_format_string= 202207L template -SPDLOG_CONSTEXPR_FUNC std::basic_string_view to_string_view(std::basic_format_string fmt) SPDLOG_NOEXCEPT +constexpr std::basic_string_view to_string_view(std::basic_format_string fmt) noexcept { return fmt.get(); } diff --git a/include/spdlog/details/circular_q.h b/include/spdlog/details/circular_q.h index e4fd5fd4..8dde6025 100644 --- a/include/spdlog/details/circular_q.h +++ b/include/spdlog/details/circular_q.h @@ -34,12 +34,12 @@ public: // move cannot be default, // since we need to reset head_, tail_, etc to zero in the moved object - circular_q(circular_q &&other) SPDLOG_NOEXCEPT + circular_q(circular_q &&other) noexcept { copy_moveable(std::move(other)); } - circular_q &operator=(circular_q &&other) SPDLOG_NOEXCEPT + circular_q &operator=(circular_q &&other) noexcept { copy_moveable(std::move(other)); return *this; @@ -128,7 +128,7 @@ public: private: // copy from other&& and reset it to disabled state - void copy_moveable(circular_q &&other) SPDLOG_NOEXCEPT + void copy_moveable(circular_q &&other) noexcept { max_items_ = other.max_items_; head_ = other.head_; diff --git a/include/spdlog/details/fmt_helper.h b/include/spdlog/details/fmt_helper.h index d9867180..663fbf9b 100644 --- a/include/spdlog/details/fmt_helper.h +++ b/include/spdlog/details/fmt_helper.h @@ -29,7 +29,7 @@ template inline void append_int(T n, memory_buf_t &dest) { // Buffer should be large enough to hold all digits (digits10 + 1) and a sign - SPDLOG_CONSTEXPR const auto BUF_SIZE = std::numeric_limits::digits10 + 2; + constexpr const auto BUF_SIZE = std::numeric_limits::digits10 + 2; char buf[BUF_SIZE]; auto [ptr, ec] = std::to_chars(buf, buf + BUF_SIZE, n, 10); @@ -52,7 +52,7 @@ inline void append_int(T n, memory_buf_t &dest) #endif template -SPDLOG_CONSTEXPR_FUNC unsigned int count_digits_fallback(T n) +constexpr unsigned int count_digits_fallback(T n) { // taken from fmt: https://github.com/fmtlib/fmt/blob/8.0.1/include/fmt/format.h#L899-L912 unsigned int count = 1; diff --git a/include/spdlog/details/log_msg_buffer-inl.h b/include/spdlog/details/log_msg_buffer-inl.h index 84d83dc2..aa6e2306 100644 --- a/include/spdlog/details/log_msg_buffer-inl.h +++ b/include/spdlog/details/log_msg_buffer-inl.h @@ -26,7 +26,7 @@ SPDLOG_INLINE log_msg_buffer::log_msg_buffer(const log_msg_buffer &other) update_string_views(); } -SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT : log_msg{other}, buffer{std::move(other.buffer)} +SPDLOG_INLINE log_msg_buffer::log_msg_buffer(log_msg_buffer &&other) noexcept : log_msg{other}, buffer{std::move(other.buffer)} { update_string_views(); } @@ -40,7 +40,7 @@ SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(const log_msg_buffer &ot return *this; } -SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT +SPDLOG_INLINE log_msg_buffer &log_msg_buffer::operator=(log_msg_buffer &&other) noexcept { log_msg::operator=(other); buffer = std::move(other.buffer); diff --git a/include/spdlog/details/log_msg_buffer.h b/include/spdlog/details/log_msg_buffer.h index 81055065..a60f7d38 100644 --- a/include/spdlog/details/log_msg_buffer.h +++ b/include/spdlog/details/log_msg_buffer.h @@ -20,9 +20,9 @@ public: log_msg_buffer() = default; explicit log_msg_buffer(const log_msg &orig_msg); log_msg_buffer(const log_msg_buffer &other); - log_msg_buffer(log_msg_buffer &&other) SPDLOG_NOEXCEPT; + log_msg_buffer(log_msg_buffer &&other) noexcept; log_msg_buffer &operator=(const log_msg_buffer &other); - log_msg_buffer &operator=(log_msg_buffer &&other) SPDLOG_NOEXCEPT; + log_msg_buffer &operator=(log_msg_buffer &&other) noexcept; }; } // namespace details diff --git a/include/spdlog/details/os-inl.h b/include/spdlog/details/os-inl.h index 02bc6daf..b6aaac43 100644 --- a/include/spdlog/details/os-inl.h +++ b/include/spdlog/details/os-inl.h @@ -74,7 +74,7 @@ namespace spdlog { namespace details { namespace os { -SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT +SPDLOG_INLINE spdlog::log_clock::time_point now() noexcept { #if defined __linux__ && defined SPDLOG_CLOCK_COARSE @@ -87,7 +87,7 @@ SPDLOG_INLINE spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT return log_clock::now(); #endif } -SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT +SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) noexcept { #ifdef _WIN32 @@ -100,13 +100,13 @@ SPDLOG_INLINE std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT return tm; } -SPDLOG_INLINE std::tm localtime() SPDLOG_NOEXCEPT +SPDLOG_INLINE std::tm localtime() noexcept { std::time_t now_t = ::time(nullptr); return localtime(now_t); } -SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT +SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) noexcept { #ifdef _WIN32 @@ -119,7 +119,7 @@ SPDLOG_INLINE std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT return tm; } -SPDLOG_INLINE std::tm gmtime() SPDLOG_NOEXCEPT +SPDLOG_INLINE std::tm gmtime() noexcept { std::time_t now_t = ::time(nullptr); return gmtime(now_t); @@ -166,7 +166,7 @@ SPDLOG_INLINE bool fopen_s(FILE **fp, const filename_t &filename, const filename return *fp == nullptr; } -SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT +SPDLOG_INLINE int remove(const filename_t &filename) noexcept { #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) return ::_wremove(filename.c_str()); @@ -175,12 +175,12 @@ SPDLOG_INLINE int remove(const filename_t &filename) SPDLOG_NOEXCEPT #endif } -SPDLOG_INLINE int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT +SPDLOG_INLINE int remove_if_exists(const filename_t &filename) noexcept { return path_exists(filename) ? remove(filename) : 0; } -SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT +SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename2) noexcept { #if defined(_WIN32) && defined(SPDLOG_WCHAR_FILENAMES) return ::_wrename(filename1.c_str(), filename2.c_str()); @@ -190,7 +190,7 @@ SPDLOG_INLINE int rename(const filename_t &filename1, const filename_t &filename } // Return true if path exists (file or directory) -SPDLOG_INLINE bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT +SPDLOG_INLINE bool path_exists(const filename_t &filename) noexcept { #ifdef _WIN32 # ifdef SPDLOG_WCHAR_FILENAMES @@ -334,7 +334,7 @@ SPDLOG_INLINE int utc_minutes_offset(const std::tm &tm) // Return current thread id as size_t // It exists because the std::this_thread::get_id() is much slower(especially // under VS 2013) -SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT +SPDLOG_INLINE size_t _thread_id() noexcept { #ifdef _WIN32 return static_cast(::GetCurrentThreadId()); @@ -383,7 +383,7 @@ SPDLOG_INLINE size_t _thread_id() SPDLOG_NOEXCEPT } // Return current thread id as size_t (from thread local storage) -SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT +SPDLOG_INLINE size_t thread_id() noexcept { #if defined(SPDLOG_NO_TLS) return _thread_id(); @@ -395,7 +395,7 @@ SPDLOG_INLINE size_t thread_id() SPDLOG_NOEXCEPT // This is avoid msvc issue in sleep_for that happens if the clock changes. // See https://github.com/gabime/spdlog/issues/609 -SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT +SPDLOG_INLINE void sleep_for_millis(unsigned int milliseconds) noexcept { #if defined(_WIN32) ::Sleep(milliseconds); @@ -419,7 +419,7 @@ SPDLOG_INLINE std::string filename_to_str(const filename_t &filename) } #endif -SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT +SPDLOG_INLINE int pid() noexcept { #ifdef _WIN32 @@ -431,7 +431,7 @@ SPDLOG_INLINE int pid() SPDLOG_NOEXCEPT // Determine if the terminal supports colors // Based on: https://github.com/agauniyal/rang/ -SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT +SPDLOG_INLINE bool is_color_terminal() noexcept { #ifdef _WIN32 return true; @@ -462,7 +462,7 @@ SPDLOG_INLINE bool is_color_terminal() SPDLOG_NOEXCEPT // Determine if the terminal attached // Source: https://github.com/agauniyal/rang/ -SPDLOG_INLINE bool in_terminal(FILE *file) SPDLOG_NOEXCEPT +SPDLOG_INLINE bool in_terminal(FILE *file) noexcept { #ifdef _WIN32 diff --git a/include/spdlog/details/os.h b/include/spdlog/details/os.h index 55067770..a5478c32 100644 --- a/include/spdlog/details/os.h +++ b/include/spdlog/details/os.h @@ -10,15 +10,15 @@ namespace spdlog { namespace details { namespace os { -SPDLOG_API spdlog::log_clock::time_point now() SPDLOG_NOEXCEPT; +SPDLOG_API spdlog::log_clock::time_point now() noexcept; -SPDLOG_API std::tm localtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT; +SPDLOG_API std::tm localtime(const std::time_t &time_tt) noexcept; -SPDLOG_API std::tm localtime() SPDLOG_NOEXCEPT; +SPDLOG_API std::tm localtime() noexcept; -SPDLOG_API std::tm gmtime(const std::time_t &time_tt) SPDLOG_NOEXCEPT; +SPDLOG_API std::tm gmtime(const std::time_t &time_tt) noexcept; -SPDLOG_API std::tm gmtime() SPDLOG_NOEXCEPT; +SPDLOG_API std::tm gmtime() noexcept; // eol definition #if !defined(SPDLOG_EOL) @@ -29,7 +29,7 @@ SPDLOG_API std::tm gmtime() SPDLOG_NOEXCEPT; # endif #endif -SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL; +constexpr static const char *default_eol = SPDLOG_EOL; // folder separator #if !defined(SPDLOG_FOLDER_SEPS) @@ -40,23 +40,23 @@ SPDLOG_CONSTEXPR static const char *default_eol = SPDLOG_EOL; # endif #endif -SPDLOG_CONSTEXPR static const char folder_seps[] = SPDLOG_FOLDER_SEPS; -SPDLOG_CONSTEXPR static const filename_t::value_type folder_seps_filename[] = SPDLOG_FILENAME_T(SPDLOG_FOLDER_SEPS); +constexpr static const char folder_seps[] = SPDLOG_FOLDER_SEPS; +constexpr static const filename_t::value_type folder_seps_filename[] = SPDLOG_FILENAME_T(SPDLOG_FOLDER_SEPS); // fopen_s on non windows for writing SPDLOG_API bool fopen_s(FILE **fp, const filename_t &filename, const filename_t &mode); // Remove filename. return 0 on success -SPDLOG_API int remove(const filename_t &filename) SPDLOG_NOEXCEPT; +SPDLOG_API int remove(const filename_t &filename) noexcept; // Remove file if exists. return 0 on success // Note: Non atomic (might return failure to delete if concurrently deleted by other process/thread) -SPDLOG_API int remove_if_exists(const filename_t &filename) SPDLOG_NOEXCEPT; +SPDLOG_API int remove_if_exists(const filename_t &filename) noexcept; -SPDLOG_API int rename(const filename_t &filename1, const filename_t &filename2) SPDLOG_NOEXCEPT; +SPDLOG_API int rename(const filename_t &filename1, const filename_t &filename2) noexcept; // Return if file exists. -SPDLOG_API bool path_exists(const filename_t &filename) SPDLOG_NOEXCEPT; +SPDLOG_API bool path_exists(const filename_t &filename) noexcept; // Return file size according to open FILE* object SPDLOG_API size_t filesize(FILE *f); @@ -67,26 +67,26 @@ SPDLOG_API int utc_minutes_offset(const std::tm &tm = details::os::localtime()); // Return current thread id as size_t // It exists because the std::this_thread::get_id() is much slower(especially // under VS 2013) -SPDLOG_API size_t _thread_id() SPDLOG_NOEXCEPT; +SPDLOG_API size_t _thread_id() noexcept; // Return current thread id as size_t (from thread local storage) -SPDLOG_API size_t thread_id() SPDLOG_NOEXCEPT; +SPDLOG_API size_t thread_id() noexcept; // This is avoid msvc issue in sleep_for that happens if the clock changes. // See https://github.com/gabime/spdlog/issues/609 -SPDLOG_API void sleep_for_millis(unsigned int milliseconds) SPDLOG_NOEXCEPT; +SPDLOG_API void sleep_for_millis(unsigned int milliseconds) noexcept; SPDLOG_API std::string filename_to_str(const filename_t &filename); -SPDLOG_API int pid() SPDLOG_NOEXCEPT; +SPDLOG_API int pid() noexcept; // Determine if the terminal supports colors // Source: https://github.com/agauniyal/rang/ -SPDLOG_API bool is_color_terminal() SPDLOG_NOEXCEPT; +SPDLOG_API bool is_color_terminal() noexcept; // Determine if the terminal attached // Source: https://github.com/agauniyal/rang/ -SPDLOG_API bool in_terminal(FILE *file) SPDLOG_NOEXCEPT; +SPDLOG_API bool in_terminal(FILE *file) noexcept; #if defined(SPDLOG_WCHAR_FILENAMES) && defined(_WIN32) SPDLOG_API void wstr_to_utf8buf(wstring_view_t wstr, memory_buf_t &target); diff --git a/include/spdlog/fmt/bin_to_hex.h b/include/spdlog/fmt/bin_to_hex.h index 3bf003d4..5da6e018 100644 --- a/include/spdlog/fmt/bin_to_hex.h +++ b/include/spdlog/fmt/bin_to_hex.h @@ -121,7 +121,7 @@ struct formatter, char> // parse the format string flags template - SPDLOG_CONSTEXPR_FUNC auto parse(ParseContext &ctx) -> decltype(ctx.begin()) + constexpr auto parse(ParseContext &ctx) -> decltype(ctx.begin()) { auto it = ctx.begin(); while (it != ctx.end() && *it != '}') @@ -158,8 +158,8 @@ struct formatter, char> template auto format(const spdlog::details::dump_info &the_range, FormatContext &ctx) const -> decltype(ctx.out()) { - SPDLOG_CONSTEXPR const char *hex_upper = "0123456789ABCDEF"; - SPDLOG_CONSTEXPR const char *hex_lower = "0123456789abcdef"; + constexpr const char *hex_upper = "0123456789ABCDEF"; + constexpr const char *hex_lower = "0123456789abcdef"; const char *hex_chars = use_uppercase ? hex_upper : hex_lower; #if !defined(SPDLOG_USE_STD_FORMAT) && FMT_VERSION < 60000 diff --git a/include/spdlog/logger-inl.h b/include/spdlog/logger-inl.h index 7d21d471..60e74724 100644 --- a/include/spdlog/logger-inl.h +++ b/include/spdlog/logger-inl.h @@ -23,7 +23,7 @@ SPDLOG_INLINE logger::logger(const logger &other) , custom_err_handler_(other.custom_err_handler_) {} -SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(other.name_)), +SPDLOG_INLINE logger::logger(logger &&other) noexcept : name_(std::move(other.name_)), sinks_(std::move(other.sinks_)), level_(other.level_.load(std::memory_order_relaxed)), flush_level_(other.flush_level_.load(std::memory_order_relaxed)), @@ -31,13 +31,13 @@ SPDLOG_INLINE logger::logger(logger &&other) SPDLOG_NOEXCEPT : name_(std::move(o {} -SPDLOG_INLINE logger &logger::operator=(logger other) SPDLOG_NOEXCEPT +SPDLOG_INLINE logger &logger::operator=(logger other) noexcept { this->swap(other); return *this; } -SPDLOG_INLINE void logger::swap(spdlog::logger &other) SPDLOG_NOEXCEPT +SPDLOG_INLINE void logger::swap(spdlog::logger &other) noexcept { name_.swap(other.name_); sinks_.swap(other.sinks_); diff --git a/include/spdlog/logger.h b/include/spdlog/logger.h index 7a74bac8..c137842f 100644 --- a/include/spdlog/logger.h +++ b/include/spdlog/logger.h @@ -72,9 +72,9 @@ public: virtual ~logger() = default; logger(const logger &other); - logger(logger &&other) SPDLOG_NOEXCEPT; - logger &operator=(logger other) SPDLOG_NOEXCEPT; - void swap(spdlog::logger &other) SPDLOG_NOEXCEPT; + logger(logger &&other) noexcept; + logger &operator=(logger other) noexcept; + void swap(spdlog::logger &other) noexcept; template void log(source_loc loc, level::level_enum lvl, format_string_t fmt, Args &&...args) diff --git a/include/spdlog/sinks/win_eventlog_sink.h b/include/spdlog/sinks/win_eventlog_sink.h index a269ebcc..819ad301 100644 --- a/include/spdlog/sinks/win_eventlog_sink.h +++ b/include/spdlog/sinks/win_eventlog_sink.h @@ -51,12 +51,12 @@ struct local_alloc_t { HLOCAL hlocal_; - SPDLOG_CONSTEXPR local_alloc_t() SPDLOG_NOEXCEPT : hlocal_(nullptr) {} + constexpr local_alloc_t() noexcept : hlocal_(nullptr) {} local_alloc_t(local_alloc_t const &) = delete; local_alloc_t &operator=(local_alloc_t const &) = delete; - ~local_alloc_t() SPDLOG_NOEXCEPT + ~local_alloc_t() noexcept { if (hlocal_) {