diff options
author | Alex Turbov <i.zaufi@gmail.com> | 2024-07-25 00:14:36 (GMT) |
---|---|---|
committer | Alex Turbov <i.zaufi@gmail.com> | 2024-08-13 18:14:04 (GMT) |
commit | efd3f2356acfe26d6d352cb438f2a2af9dd20437 (patch) | |
tree | 52f5c23632d3671c97a896aeb235c6b35e929333 | |
parent | 0b180e03683dddcfedcf0a8f6690f2cd606ef7f5 (diff) | |
download | CMake-efd3f2356acfe26d6d352cb438f2a2af9dd20437.zip CMake-efd3f2356acfe26d6d352cb438f2a2af9dd20437.tar.gz CMake-efd3f2356acfe26d6d352cb438f2a2af9dd20437.tar.bz2 |
cmMessenger.cxx: Replace `printMessagePreamble` → `getMessageTypeStr`
According to the compiler explorer the `getMessageTypeStr()` much shorter
and faster (as table lookup).
-rw-r--r-- | Source/cmMessenger.cxx | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/Source/cmMessenger.cxx b/Source/cmMessenger.cxx index bc9a078..1a456bd 100644 --- a/Source/cmMessenger.cxx +++ b/Source/cmMessenger.cxx @@ -22,27 +22,27 @@ #endif namespace { -bool printMessagePreamble(MessageType t, std::ostream& msg) +const char* getMessageTypeStr(MessageType t) { - // Construct the message header. - if (t == MessageType::FATAL_ERROR) { - msg << "CMake Error"; - } else if (t == MessageType::INTERNAL_ERROR) { - msg << "CMake Internal Error (please report a bug)"; - } else if (t == MessageType::LOG) { - msg << "CMake Debug Log"; - } else if (t == MessageType::DEPRECATION_ERROR) { - msg << "CMake Deprecation Error"; - } else if (t == MessageType::DEPRECATION_WARNING) { - msg << "CMake Deprecation Warning"; - } else if (t == MessageType::AUTHOR_WARNING) { - msg << "CMake Warning (dev)"; - } else if (t == MessageType::AUTHOR_ERROR) { - msg << "CMake Error (dev)"; - } else { - msg << "CMake Warning"; + switch (t) { + case MessageType::FATAL_ERROR: + return "Error"; + case MessageType::INTERNAL_ERROR: + return "Internal Error (please report a bug)"; + case MessageType::LOG: + return "Debug Log"; + case MessageType::DEPRECATION_ERROR: + return "Deprecation Error"; + case MessageType::DEPRECATION_WARNING: + return "Deprecation Warning"; + case MessageType::AUTHOR_WARNING: + return "Warning (dev)"; + case MessageType::AUTHOR_ERROR: + return "Error (dev)"; + default: + break; } - return true; + return "Warning"; } int getMessageColor(MessageType t) @@ -200,9 +200,9 @@ void cmMessenger::DisplayMessage(MessageType t, const std::string& text, const cmListFileBacktrace& backtrace) const { std::ostringstream msg; - if (!printMessagePreamble(t, msg)) { - return; - } + + // Print the message preamble. + msg << "CMake " << getMessageTypeStr(t); // Add the immediate context. this->PrintBacktraceTitle(msg, backtrace); |