From c8a1118308d7d3a568b4fb2638700028a4b77970 Mon Sep 17 00:00:00 2001 From: staviq Date: Fri, 25 Aug 2023 17:41:15 +0200 Subject: [PATCH] fix LOG_TEELN and configchecker --- common/log.h | 6 ++++-- examples/main/main.cpp | 1 - 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/common/log.h b/common/log.h index b148474d9..926a25e35 100644 --- a/common/log.h +++ b/common/log.h @@ -244,7 +244,7 @@ enum LogTriState // LOG macro variants with auto endline. #define LOGLN(...) _LOG(__VA_ARGS__, "\n") -#define LOG_TEELN(...) _LOG(__VA_ARGS__, "\n") +#define LOG_TEELN(...) _LOG_TEE(__VA_ARGS__, "\n") // INTERNAL, DO NOT USE inline FILE *_log_handler1(bool change = false, LogTriState disable = LogTriStateSame, std::string filename = LOG_DEFAULT_FILE_NAME, FILE *target = nullptr) @@ -496,7 +496,9 @@ inline void log_print_usage() // INTERNAL, DO NOT USE inline void _log_dump_cmdline(int argc, char **argv) { - std::string buf; + // TODO: + // Windows doesn't seem to like this somehow + std::string buf{""}; for (int i = 0; i < argc; ++i) { if (std::string(argv[i]).find(' ') != std::string::npos) diff --git a/examples/main/main.cpp b/examples/main/main.cpp index 08b1950c4..e46b36c12 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -238,7 +238,6 @@ int main(int argc, char ** argv) { guidance_offset = (int)guidance_inp.size() - original_prompt_len; LOG("original_prompt_len: %s", LOG_TOSTR(original_prompt_len)) LOG("guidance_offset: %s", LOG_TOSTR(guidance_offset)) - } const int n_ctx = llama_n_ctx(ctx);