diff options
| author | Andrew Downing <andrew2085@gmail.com> | 2024-05-01 17:31:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-01 23:31:30 +0200 |
| commit | b0d943de179ad5dbd83d51f327fb566066f4ccda (patch) | |
| tree | e0264035002e1aa585925cfbcd4393a3e6539306 /common/log.h | |
| parent | 8d608a81b7bd170f700648f8214e6f3279d4d715 (diff) | |
Update LOG_IMPL and LOG_TEE_IMPL (#7029)
ROCm clang defines _MSC_VER which results in the wrong implementation of LOG_IMPL and LOG_TEE_IMPL being compiled.
This fixes https://github.com/ggerganov/llama.cpp/issues/6972
Diffstat (limited to 'common/log.h')
| -rw-r--r-- | common/log.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/log.h b/common/log.h index 2b2f0e45..6934c57b 100644 --- a/common/log.h +++ b/common/log.h @@ -234,7 +234,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std:: // INTERNAL, DO NOT USE // USE LOG() INSTEAD // -#if !defined(_MSC_VER) || defined(__INTEL_LLVM_COMPILER) +#if !defined(_MSC_VER) || defined(__INTEL_LLVM_COMPILER) || defined(__clang__) #define LOG_IMPL(str, ...) \ do { \ if (LOG_TARGET != nullptr) \ @@ -257,7 +257,7 @@ inline std::string log_filename_generator_impl(LogTriState multilog, const std:: // INTERNAL, DO NOT USE // USE LOG_TEE() INSTEAD // -#if !defined(_MSC_VER) || defined(__INTEL_LLVM_COMPILER) +#if !defined(_MSC_VER) || defined(__INTEL_LLVM_COMPILER) || defined(__clang__) #define LOG_TEE_IMPL(str, ...) \ do { \ if (LOG_TARGET != nullptr) \ |