From 26cb51217c060b70b36f8d14a1c8c3d61d8a8939 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Fri, 19 May 2023 05:04:51 +0300 Subject: [PATCH 1/2] Update loglevels.hpp See #495 for details --- src/g3log/loglevels.hpp | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/g3log/loglevels.hpp b/src/g3log/loglevels.hpp index 1ddfc63d..1d1bb4bc 100644 --- a/src/g3log/loglevels.hpp +++ b/src/g3log/loglevels.hpp @@ -35,9 +35,6 @@ struct LEVELS { LEVELS(const LEVELS& other): value(other.value), text(other.text.c_str()) {} - #if __cplusplus >= 202002L - constexpr - #endif LEVELS(int id, const std::string& idtext) : value(id), text(idtext) {} bool operator==(const LEVELS& rhs) const { @@ -94,11 +91,7 @@ namespace g3 { static const int kInternalFatalValue = 2000; } // g3 -#if __cplusplus >= 202002L - constexpr -#else - const -#endif +const LEVELS G3LOG_DEBUG{g3::kDebugValue, "DEBUG"}, INFO {g3::kInfoValue, "INFO"}, WARNING {g3::kWarningValue, "WARNING"}, @@ -137,11 +130,7 @@ namespace g3 { namespace g3 { namespace internal { - #if __cplusplus >= 202002L - constexpr - #else - const - #endif + const LEVELS CONTRACT {g3::kInternalFatalValue, {"CONTRACT"}}, FATAL_SIGNAL {g3::kInternalFatalValue + 1, {"FATAL_SIGNAL"}}, FATAL_EXCEPTION {kInternalFatalValue + 2, {"FATAL_EXCEPTION"}}; From c360518ac558e60ad0495c955ae3ad533048b3a4 Mon Sep 17 00:00:00 2001 From: CryptoManiac Date: Sat, 20 May 2023 09:23:39 +0300 Subject: [PATCH 2/2] Update loglevels.hpp --- src/g3log/loglevels.hpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/g3log/loglevels.hpp b/src/g3log/loglevels.hpp index 1d1bb4bc..b72bcb74 100644 --- a/src/g3log/loglevels.hpp +++ b/src/g3log/loglevels.hpp @@ -91,8 +91,7 @@ namespace g3 { static const int kInternalFatalValue = 2000; } // g3 -const -LEVELS G3LOG_DEBUG{g3::kDebugValue, "DEBUG"}, +const LEVELS G3LOG_DEBUG{g3::kDebugValue, "DEBUG"}, INFO {g3::kInfoValue, "INFO"}, WARNING {g3::kWarningValue, "WARNING"}, FATAL {g3::kFatalValue, "FATAL"}; @@ -130,8 +129,7 @@ namespace g3 { namespace g3 { namespace internal { - const - LEVELS CONTRACT {g3::kInternalFatalValue, {"CONTRACT"}}, + const LEVELS CONTRACT {g3::kInternalFatalValue, {"CONTRACT"}}, FATAL_SIGNAL {g3::kInternalFatalValue + 1, {"FATAL_SIGNAL"}}, FATAL_EXCEPTION {kInternalFatalValue + 2, {"FATAL_EXCEPTION"}};