From 6043181636ba9de95d0022d01a642d4eaa806fbf Mon Sep 17 00:00:00 2001 From: Leo Yuriev Date: Fri, 14 Sep 2018 15:13:05 +0300 Subject: [PATCH] mdbx-test: workaroung for MSVC bug. --- test/log.cc | 6 +++--- test/log.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/log.cc b/test/log.cc index 7bc3ecf6..0e325e3a 100644 --- a/test/log.cc +++ b/test/log.cc @@ -57,7 +57,7 @@ static void mdbx_logger(int type, const char *function, int line, if (logging::output( level, strncmp(function, "mdbx_", 5) == 0 ? "%s: " : "mdbx: %s: ", function)) - logging::feed(msg, args); + logging::feed_ap(msg, args); if (type & MDBX_DBG_ASSERT) abort(); } @@ -193,7 +193,7 @@ bool output(const logging::loglevel priority, const char *format, va_list ap) { return true; } -bool feed(const char *format, va_list ap) { +bool feed_ap(const char *format, va_list ap) { if (!last) return false; @@ -212,7 +212,7 @@ bool feed(const char *format, ...) { va_list ap; va_start(ap, format); - feed(format, ap); + feed_ap(format, ap); va_end(ap); return true; } diff --git a/test/log.h b/test/log.h index 7350f1b9..ecdd91bf 100644 --- a/test/log.h +++ b/test/log.h @@ -42,7 +42,7 @@ void setlevel(loglevel level); bool output(const loglevel priority, const char *format, va_list ap); bool __printf_args(2, 3) output(const loglevel priority, const char *format, ...); -bool feed(const char *format, va_list ap); +bool feed_ap(const char *format, va_list ap); bool __printf_args(1, 2) feed(const char *format, ...); class local_suffix {