[Mockpp-commits] mockpp/mockpp/compat AssertionFailedError.cpp,1.19,1.20
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2006-04-26 20:43:11
|
Update of /cvsroot/mockpp/mockpp/mockpp/compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp/compat Modified Files: AssertionFailedError.cpp Log Message: renamed a number of internal variables to avoid warning messages Index: AssertionFailedError.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/AssertionFailedError.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- AssertionFailedError.cpp 15 Mar 2006 21:34:02 -0000 1.19 +++ AssertionFailedError.cpp 26 Apr 2006 20:43:06 -0000 1.20 @@ -36,9 +36,9 @@ MOCKPP_EXPORT -AssertionFailedError::AssertionFailedError (unsigned srcline, const char* srcfile, - const String &msg) - : Exception(srcline, srcfile, msg) +AssertionFailedError::AssertionFailedError (unsigned in_srcline, const char* in_srcfile, + const String &in_msg) + : Exception(in_srcline, in_srcfile, in_msg) { } @@ -50,10 +50,10 @@ MOCKPP_EXPORT -void assertionFailed(unsigned srcline, const String& srcfile, - const String &message) +void assertionFailed(unsigned in_srcline, const String& in_srcfile, + const String &in_message) { - assertionFailed(srcline, getLatin1(srcfile).c_str(), message); + assertionFailed(in_srcline, getLatin1(in_srcfile).c_str(), in_message); } |