[Mockpp-commits] mockpp/mockpp/constraint ConstraintList.h,1.3,1.4

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp/constraint
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8234/mockpp/constraint

Modified Files:
	ConstraintList.h 
Log Message:
fix macro namespace

Index: ConstraintList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/constraint/ConstraintList.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- ConstraintList.h	6 Apr 2005 20:11:28 -0000	1.3
+++ ConstraintList.h	7 May 2005 12:46:19 -0000	1.4
@@ -92,7 +92,7 @@
     {
       if( expectNothing)
       {
-        String fmt = i18n(MOCKPP_PCHAR("%1 expected no value."));
+        String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected no value."));
         fmt << this->getVerifiableName();
         MOCKPP_ASSERT_FALSE_MESSAGE(fmt, haveActualValue );
       }
@@ -101,12 +101,12 @@
         if (!this->hasExpectations() )
           return;
 
-        String fmt = i18n(MOCKPP_PCHAR("%1 expected a value."));
+        String fmt = mockpp_i18n(MOCKPP_PCHAR("%1 expected a value."));
         fmt << this->getVerifiableName();
 
         MOCKPP_ASSERT_TRUE_MESSAGE(fmt, haveActualValue);
 
-        fmt = i18n(MOCKPP_PCHAR("%1 did not receive the expected amount of values."));
+        fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected amount of values."));
         fmt << this->getVerifiableName();
         MOCKPP_ASSERT_TRUE_MESSAGE(fmt, actualItems.size() == constraints.size());
 
@@ -272,14 +272,14 @@
     */
     void checkImmediateValue(const T &actualItem, unsigned pos) const
     {
-      String fmt = i18n(MOCKPP_PCHAR("%1 had different item sizes.\n")
+      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() << constraints.size() << (pos+1) << actualItem;
 
       MOCKPP_ASSERT_TRUE_MESSAGE(fmt, constraints.size() > pos);
 
       String s;
-      fmt = i18n(MOCKPP_PCHAR("%1 added constraint[%2] does not match: <%3> != %4"));
+      fmt = mockpp_i18n(MOCKPP_PCHAR("%1 added constraint[%2] does not match: <%3> != %4"));
       fmt << this->getVerifiableName() << pos << constraints[pos]->describeTo(s) << actualItem;
       MOCKPP_ASSERT_TRUE_MESSAGE(fmt, constraints[pos]->eval(actualItem));
     }