diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/message.cpp | 2 | ||||
-rw-r--r-- | src/message.h | 2 | ||||
-rw-r--r-- | src/template.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/message.cpp b/src/message.cpp index ff5dac2..dad3e0e 100644 --- a/src/message.cpp +++ b/src/message.cpp @@ -172,7 +172,7 @@ void warn(const char *file,int line,const char *fmt, ...) va_end(args); } -void warn(const char *file,int line,const char *fmt,va_list args) +void va_warn(const char *file,int line,const char *fmt,va_list args) { do_warn("WARNINGS", file, line, warning_str, fmt, args); } diff --git a/src/message.h b/src/message.h index 2875e81..ca76a20 100644 --- a/src/message.h +++ b/src/message.h @@ -23,7 +23,7 @@ extern void msg(const char *fmt, ...); extern void warn(const char *file,int line,const char *fmt, ...); -extern void warn(const char *file,int line,const char *fmt, va_list args); +extern void va_warn(const char *file,int line,const char *fmt, va_list args); extern void warn_simple(const char *file,int line,const char *text); extern void warn_undoc(const char *file,int line,const char *fmt, ...); extern void warn_doc_error(const char *file,int line,const char *fmt, ...); diff --git a/src/template.cpp b/src/template.cpp index 793d769..ea3c673 100644 --- a/src/template.cpp +++ b/src/template.cpp @@ -1713,7 +1713,7 @@ void TemplateContextImpl::warn(const char *fileName,int line,const char *fmt,... { va_list args; va_start(args,fmt); - ::warn(fileName,line,fmt,args); + va_warn(fileName,line,fmt,args); va_end(args); m_engine->printIncludeContext(fileName,line); } @@ -3342,7 +3342,7 @@ void TemplateParser::warn(const char *fileName,int line,const char *fmt,...) con { va_list args; va_start(args,fmt); - ::warn(fileName,line,fmt,args); + va_warn(fileName,line,fmt,args); va_end(args); m_engine->printIncludeContext(fileName,line); } |