From: Gonzalo A. <ga...@us...> - 2006-11-06 17:10:06
|
Update of /cvsroot/mod-c/ehtml/src In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv2415/src Modified Files: EHTMLApplication.cpp Request.cpp Log Message: Renamed logging methods that receive a va_list argument. g++ gets confused because a va_list is compatible with a char* (apparently). By renaming these methods, we eliminate the ambiguity between vararg methods and va_list methods. Index: Request.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/Request.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** Request.cpp 18 Oct 2006 12:51:12 -0000 1.14 --- Request.cpp 6 Nov 2006 17:09:54 -0000 1.15 *************** *** 136,140 **** va_list l; va_start(l, fmt); ! Application->Error(fmt, l); va_end(l); } --- 136,140 ---- va_list l; va_start(l, fmt); ! Application->vError(fmt, l); va_end(l); } *************** *** 146,150 **** va_list l; va_start(l, fmt); ! Application->Debug(fmt, l); va_end(l); } --- 146,150 ---- va_list l; va_start(l, fmt); ! Application->vDebug(fmt, l); va_end(l); } Index: EHTMLApplication.cpp =================================================================== RCS file: /cvsroot/mod-c/ehtml/src/EHTMLApplication.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** EHTMLApplication.cpp 31 Oct 2006 19:17:56 -0000 1.19 --- EHTMLApplication.cpp 6 Nov 2006 17:09:54 -0000 1.20 *************** *** 240,244 **** } ! void EHTMLApplication::Error(const char* fmt, va_list l) const { ProfileMe(); Log(APLOG_ERR, fmt, l); --- 240,244 ---- } ! void EHTMLApplication::vError(const char* fmt, va_list l) const { ProfileMe(); Log(APLOG_ERR, fmt, l); *************** *** 253,257 **** } ! void EHTMLApplication::Debug(const char* fmt, va_list l) const { ProfileMe(); Log(APLOG_DEBUG, fmt, l); --- 253,257 ---- } ! void EHTMLApplication::vDebug(const char* fmt, va_list l) const { ProfileMe(); Log(APLOG_DEBUG, fmt, l); |