From d26f9c2fb5a9666822a0f702d76b764600a390d7 Mon Sep 17 00:00:00 2001 From: hop311 Date: Fri, 13 Oct 2023 22:04:12 +0100 Subject: Further CLI and modifier reading work --- src/openvic-simulation/utility/Logger.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/openvic-simulation/utility/Logger.cpp') diff --git a/src/openvic-simulation/utility/Logger.cpp b/src/openvic-simulation/utility/Logger.cpp index fca08a5..68c43dd 100644 --- a/src/openvic-simulation/utility/Logger.cpp +++ b/src/openvic-simulation/utility/Logger.cpp @@ -4,19 +4,19 @@ using namespace OpenVic; -Logger::log_func_t Logger::info_func {}; -Logger::log_queue_t Logger::info_queue {}; -Logger::log_func_t Logger::warning_func {}; -Logger::log_queue_t Logger::warning_queue {}; -Logger::log_func_t Logger::error_func {}; -Logger::log_queue_t Logger::error_queue {}; +void Logger::set_logger_funcs() { + Logger::set_info_func([](std::string&& str) { std::cout << str; }); + Logger::set_warning_func([](std::string&& str) { std::cerr << str; }); + Logger::set_error_func([](std::string&& str) { std::cerr << str; }); +} -char const* Logger::get_filename(char const* filepath) { - if (filepath == nullptr) return nullptr; +char const* Logger::get_filename(char const* filepath, char const* default_path) { + if (filepath == nullptr) return default_path; char const* last_slash = filepath; while (*filepath != '\0') { if (*filepath == '\\' || *filepath == '/') last_slash = filepath + 1; filepath++; } + if (*last_slash == '\0') return default_path; return last_slash; } -- cgit v1.2.3-56-ga3b1