Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9920/mockpp
Modified Files:
CountParameters.h ExpectationList.h mockpp.cpp
mockpp_config-bcb5.h mockpp_config-msvc_71.h
Log Message:
renamed a number of internal variables to avoid warning messages
Index: mockpp_config-bcb5.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-bcb5.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mockpp_config-bcb5.h 17 Mar 2006 08:42:46 -0000 1.5
+++ mockpp_config-bcb5.h 26 Apr 2006 20:43:06 -0000 1.6
@@ -1,6 +1,6 @@
// #define's for Borland BCB5
// derived from automatically generated config.h. See Makefile.am.
-/* Generated: 2006-03-16 */
+/* Generated: 2006-04-26 */
#pragma warn -8030 // temporary variables
@@ -11,7 +11,7 @@
#undef DEBUG
/* Version number of package */
-#define MOCKPP_VERSION "1.11.4"
+#define MOCKPP_VERSION "1.11.5"
/* Name of package */
#define MOCKPP_PACKAGE "mockpp"
Index: mockpp.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- mockpp.cpp 5 Apr 2006 17:03:37 -0000 1.27
+++ mockpp.cpp 26 Apr 2006 20:43:06 -0000 1.28
@@ -54,7 +54,7 @@
major = MOCKPP_STD_NS::atoi(num.c_str());
#endif
s.erase(0, pos+1);
- MOCKPP_STD_NS::size_t pos = s.find('.');
+ pos = s.find('.');
if (pos != MOCKPP_STL::string::npos)
{
Index: mockpp_config-msvc_71.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp_config-msvc_71.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mockpp_config-msvc_71.h 17 Mar 2006 08:42:46 -0000 1.5
+++ mockpp_config-msvc_71.h 26 Apr 2006 20:43:06 -0000 1.6
@@ -1,6 +1,6 @@
// #define's for MS Visual C++ 7.1 and later (NOT 6.0/7.0)
// derived from automatically generated config.h. See Makefile.am.
-/* Generated: 2006-03-16 */
+/* Generated: 2006-04-26 */
/* Define to use sprintf_s instead of sprintf. */
#if _MSC_VER >= 1400
@@ -11,7 +11,7 @@
#undef DEBUG
/* Version number of package */
-#define MOCKPP_VERSION "1.11.4"
+#define MOCKPP_VERSION "1.11.5"
/* Name of package */
#define MOCKPP_PACKAGE "mockpp"
Index: ExpectationList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationList.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- ExpectationList.h 5 Apr 2006 17:03:37 -0000 1.43
+++ ExpectationList.h 26 Apr 2006 20:43:06 -0000 1.44
@@ -226,17 +226,17 @@
*/
void checkImmediateValue(const T &actualItem) const
{
- unsigned size = actualItems.size();
+ unsigned itemsize = actualItems.size();
String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 had different item sizes.\n")
MOCKPP_PCHAR("Expected %2 items but received %3 when adding %4."));
- fmt << this->getVerifiableName() << expectedItems.size() << size << actualItem;
+ fmt << this->getVerifiableName() << expectedItems.size() << itemsize << actualItem;
- MOCKPP_ASSERT_TRUE_MESSAGE(fmt, expectedItems.size() >= size);
+ MOCKPP_ASSERT_TRUE_MESSAGE(fmt, expectedItems.size() >= itemsize);
fmt = mockpp_i18n(MOCKPP_PCHAR("%1 added item[%2] does not match. %3 != %4."));
- fmt << this->getVerifiableName() << size << expectedItems[(size - 1)] << actualItem;
+ fmt << this->getVerifiableName() << itemsize << expectedItems[(itemsize - 1)] << actualItem;
- this->assertEquals(fmt, actualItem, expectedItems[(size - 1)]);
+ this->assertEquals(fmt, actualItem, expectedItems[(itemsize - 1)]);
}
private:
|
