From fc0a5f1fbe2184a20e83b847b6cfa45b26b7146a Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 19 Sep 2023 10:16:12 -0700 Subject: [PATCH 1/2] Deprecate LOG_X in favor of kLogX. --- fml/log_level.h | 38 ++++++++++++++++++++++++++++---------- 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/fml/log_level.h b/fml/log_level.h index 2c9a85305b53d..d0d609bc1584c 100644 --- a/fml/log_level.h +++ b/fml/log_level.h @@ -7,29 +7,47 @@ namespace fml { +// Default log levels. Negative values can be used for verbose log levels. typedef int LogSeverity; -// Default log levels. Negative values can be used for verbose log levels. -constexpr LogSeverity LOG_INFO = 0; -constexpr LogSeverity LOG_WARNING = 1; -constexpr LogSeverity LOG_ERROR = 2; -constexpr LogSeverity LOG_FATAL = 3; -constexpr LogSeverity LOG_NUM_SEVERITIES = 4; +constexpr LogSeverity kLogInfo = 0; +constexpr LogSeverity kLogWarning = 1; +constexpr LogSeverity kLogError = 2; +constexpr LogSeverity kLogFatal = 3; +constexpr LogSeverity kLogNumSeverities = 4; + +// DEPRECATED: Use |kLogInfo|. +[[deprecated]] constexpr LogSeverity LOG_INFO = kLogInfo; + +// DEPRECATED: Use |kLogWarning|. +[[deprecated]] constexpr LogSeverity LOG_WARNING = kLogWarning; + +// DEPRECATED: Use |kLogError|. +[[deprecated]] constexpr LogSeverity LOG_ERROR = kLogError; + +// DEPRECATED: Use |kLogFatal|. +[[deprecated]] constexpr LogSeverity LOG_FATAL = kLogFatal; + +// DEPRECATED: Use |kLogNumSeverities|. +[[deprecated]] constexpr LogSeverity LOG_NUM_SEVERITIES = kLogNumSeverities; // One of the Windows headers defines ERROR to 0. This makes the token // concatenation in FML_LOG(ERROR) to resolve to LOG_0. We define this back to // the appropriate log level. #ifdef _WIN32 -#define LOG_0 LOG_ERROR +#define LOG_0 kLogError #endif -// LOG_DFATAL is LOG_FATAL in debug mode, ERROR in normal mode +// kLogDFatal is kLogFatal in debug mode, kLogError in normal mode #ifdef NDEBUG -const LogSeverity LOG_DFATAL = LOG_ERROR; +const LogSeverity kLogDFatal = kLogError; #else -const LogSeverity LOG_DFATAL = LOG_FATAL; +const LogSeverity kLogDFatal = kLogFatal; #endif +// DEPRECATED: Use |kLogDFatal|. +[[deprecated]] const LogSeverity LOG_DFATAL = kLogDFatal; + } // namespace fml #endif // FLUTTER_FML_LOG_LEVEL_H_ From 3b425491660f6cad40e45be0e77754db51da93f6 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Tue, 19 Sep 2023 10:26:34 -0700 Subject: [PATCH 2/2] Remove [[deprecated]]. --- fml/log_level.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/fml/log_level.h b/fml/log_level.h index d0d609bc1584c..30e40a48055c3 100644 --- a/fml/log_level.h +++ b/fml/log_level.h @@ -17,19 +17,19 @@ constexpr LogSeverity kLogFatal = 3; constexpr LogSeverity kLogNumSeverities = 4; // DEPRECATED: Use |kLogInfo|. -[[deprecated]] constexpr LogSeverity LOG_INFO = kLogInfo; +constexpr LogSeverity LOG_INFO = kLogInfo; // DEPRECATED: Use |kLogWarning|. -[[deprecated]] constexpr LogSeverity LOG_WARNING = kLogWarning; +constexpr LogSeverity LOG_WARNING = kLogWarning; // DEPRECATED: Use |kLogError|. -[[deprecated]] constexpr LogSeverity LOG_ERROR = kLogError; +constexpr LogSeverity LOG_ERROR = kLogError; // DEPRECATED: Use |kLogFatal|. -[[deprecated]] constexpr LogSeverity LOG_FATAL = kLogFatal; +constexpr LogSeverity LOG_FATAL = kLogFatal; // DEPRECATED: Use |kLogNumSeverities|. -[[deprecated]] constexpr LogSeverity LOG_NUM_SEVERITIES = kLogNumSeverities; +constexpr LogSeverity LOG_NUM_SEVERITIES = kLogNumSeverities; // One of the Windows headers defines ERROR to 0. This makes the token // concatenation in FML_LOG(ERROR) to resolve to LOG_0. We define this back to @@ -46,7 +46,7 @@ const LogSeverity kLogDFatal = kLogFatal; #endif // DEPRECATED: Use |kLogDFatal|. -[[deprecated]] const LogSeverity LOG_DFATAL = kLogDFatal; +const LogSeverity LOG_DFATAL = kLogDFatal; } // namespace fml