[Mockpp-commits] mockpp/mockpp ExpectationList.h,1.42,1.43 ExpectationValue.h,1.33,1.34 MockTimeServer.cpp,1.3,1.4 MockTimeServer.h,1.4,1.5 mockpp.cpp,1.26,1.27

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

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

Modified Files:
	ExpectationList.h ExpectationValue.h MockTimeServer.cpp 
	MockTimeServer.h mockpp.cpp 
Log Message:
more namespace disabling

Index: mockpp.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- mockpp.cpp	15 Mar 2006 21:33:58 -0000	1.26
+++ mockpp.cpp	5 Apr 2006 17:03:37 -0000	1.27
@@ -41,7 +41,7 @@
   MOCKPP_STL::string num;
   info = "";
 
-  std::size_t pos = s.find('.');
+  MOCKPP_STD_NS::size_t pos = s.find('.');
   bool good = true;
   if (pos != MOCKPP_STL::string::npos)
   {
@@ -51,10 +51,10 @@
 #ifdef _MSC_VER_60_70 // MAT using namespace std; instead ? EA: no :-)
     major = atoi(num.c_str());
 #else
-    major = std::atoi(num.c_str());
+    major = MOCKPP_STD_NS::atoi(num.c_str());
 #endif
     s.erase(0, pos+1);
-    std::size_t pos = s.find('.');
+    MOCKPP_STD_NS::size_t pos = s.find('.');
 
     if (pos != MOCKPP_STL::string::npos)
     {
@@ -64,7 +64,7 @@
 #ifdef _MSC_VER_60_70
       minor = atoi(num.c_str());
 #else
-      minor = std::atoi(num.c_str());
+      minor = MOCKPP_STD_NS::atoi(num.c_str());
 #endif
       s.erase(0, pos+1);
 
@@ -73,7 +73,7 @@
 #ifdef _MSC_VER_60_70
       patch = atoi(s.c_str());
 #else
-      patch = std::atoi(s.c_str());
+      patch = MOCKPP_STD_NS::atoi(s.c_str());
 #endif
     }
     else

Index: ExpectationList.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationList.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- ExpectationList.h	15 Mar 2006 21:33:56 -0000	1.42
+++ ExpectationList.h	5 Apr 2006 17:03:37 -0000	1.43
@@ -236,7 +236,7 @@
       fmt = mockpp_i18n(MOCKPP_PCHAR("%1 added item[%2] does not match. %3 != %4."));
       fmt << this->getVerifiableName() << size << expectedItems[(size - 1)] << actualItem;
 
-      assertEquals(fmt, actualItem, expectedItems[(size - 1)]);
+      this->assertEquals(fmt, actualItem, expectedItems[(size - 1)]);
     }
 
   private:

Index: ExpectationValue.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ExpectationValue.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- ExpectationValue.h	15 Mar 2006 21:33:56 -0000	1.33
+++ ExpectationValue.h	5 Apr 2006 17:03:37 -0000	1.34
@@ -145,7 +145,7 @@
         fmt = mockpp_i18n(MOCKPP_PCHAR("%1 did not receive the expected value. %2 != %3."));
         fmt << this->getVerifiableName() << myExpectedValue << myActualValue;
 
-        assertEquals(fmt, myExpectedValue, myActualValue);
+        this->assertEquals(fmt, myExpectedValue, myActualValue);
       }
     }
 

Index: MockTimeServer.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/MockTimeServer.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- MockTimeServer.h	15 Mar 2006 21:33:56 -0000	1.4
+++ MockTimeServer.h	5 Apr 2006 17:03:37 -0000	1.5
@@ -57,16 +57,16 @@
   /** Returns the "current" unix time
     * @return unix time
     */
-    virtual std::time_t getUnixTime();
+    virtual MOCKPP_STD_NS::time_t getUnixTime();
 
   /** Adds another "current" unix time
     * @param time  unix time
     */
-    void addUnixTime(std::time_t time);
+    void addUnixTime(MOCKPP_STD_NS::time_t time);
 
   private:
 
-    MOCKPP_NS::ReturnObjectList<std::time_t> mocktimes;
+    MOCKPP_NS::ReturnObjectList<MOCKPP_STD_NS::time_t> mocktimes;
 };
 
 

Index: MockTimeServer.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/MockTimeServer.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- MockTimeServer.cpp	15 Mar 2006 21:33:56 -0000	1.3
+++ MockTimeServer.cpp	5 Apr 2006 17:03:37 -0000	1.4
@@ -43,13 +43,13 @@
 }
 
 
-std::time_t MOCKPP_EXPORT MockTimeServer::getUnixTime()
+MOCKPP_STD_NS::time_t MOCKPP_EXPORT MockTimeServer::getUnixTime()
 {
   return mocktimes.nextReturnObject();
 }
 
 
-void MOCKPP_EXPORT MockTimeServer::addUnixTime(std::time_t time)
+void MOCKPP_EXPORT MockTimeServer::addUnixTime(MOCKPP_STD_NS::time_t time)
 {
   mocktimes.addObjectToReturn(time);
 }