From 2d48010ad0eb8552ebb87b7eb928f878444e8ff6 Mon Sep 17 00:00:00 2001 From: Florian Becker Date: Wed, 13 Nov 2024 19:08:59 +0100 Subject: [PATCH] Revert "Fix hex writing" This reverts commit 854318ece3ae2f213456aa2facffc3351ed095c4. --- cmake/fetch/doxygen-awesome-css.cmake | 2 +- source/Demangle.cpp | 2 +- source/Logger.cpp | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmake/fetch/doxygen-awesome-css.cmake b/cmake/fetch/doxygen-awesome-css.cmake index c7662bd..a859ace 100644 --- a/cmake/fetch/doxygen-awesome-css.cmake +++ b/cmake/fetch/doxygen-awesome-css.cmake @@ -32,7 +32,7 @@ include(FetchContent) FetchContent_Declare(doxygen-awesome-css GIT_REPOSITORY https://github.com/jothepro/doxygen-awesome-css.git - GIT_TAG v2.3.4 + GIT_TAG v2.3.1 GIT_SHALLOW 1 ) diff --git a/source/Demangle.cpp b/source/Demangle.cpp index 35f9ef3..f811a5d 100644 --- a/source/Demangle.cpp +++ b/source/Demangle.cpp @@ -161,7 +161,7 @@ namespace vx::demangle { /* Try to fix no spaces and comma issues */ RE2::GlobalReplace( &result, " ,", "," ); - if ( !result.contains( ", " ) ) { + if ( result.find( ", " ) == std::string::npos ) { RE2::GlobalReplace( &result, ",", ", " ); } diff --git a/source/Logger.cpp b/source/Logger.cpp index f879105..222d890 100644 --- a/source/Logger.cpp +++ b/source/Logger.cpp @@ -150,22 +150,22 @@ namespace vx::logger { switch ( _severity ) { case Severity::Verbose: - result += "\x{1b}[37;1m[" + severity + "]\x{1b}[0m"; + result += "\x1b[37;1m[" + severity + "]\x1b[0m"; break; case Severity::Debug: - result += " \x{1b}[34;1m[" + severity + "]\x{1b}[0m"; + result += " \x1b[34;1m[" + severity + "]\x1b[0m"; break; case Severity::Info: - result += " \x{1b}[32;1m[" + severity + "]\x{1b}[0m"; + result += " \x1b[32;1m[" + severity + "]\x1b[0m"; break; case Severity::Warning: - result += "\x{1b}[33;1m[" + severity + "]\x{1b}[0m"; + result += "\x1b[33;1m[" + severity + "]\x1b[0m"; break; case Severity::Error: - result += " \x{1b}[31;1m[" + severity + "]\x{1b}[0m"; + result += " \x1b[31;1m[" + severity + "]\x1b[0m"; break; case Severity::Fatal: - result += " \x{1b}[41;1m[" + severity + "]\x{1b}[0m"; + result += " \x1b[41;1m[" + severity + "]\x1b[0m"; break; } return result;