[Mockpp-commits] mockpp/mockpp/production TimeServer.cpp,1.10,1.11 TimeServer.h,1.5,1.6
Brought to you by:
ewald-arnold
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:27
|
Update of /cvsroot/mockpp/mockpp/mockpp/production In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/production Modified Files: TimeServer.cpp TimeServer.h Log Message: more namespace disabling Index: TimeServer.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- TimeServer.h 22 Mar 2006 19:13:34 -0000 1.5 +++ TimeServer.h 5 Apr 2006 17:03:40 -0000 1.6 @@ -55,7 +55,7 @@ /** Returns the current unix time * @return unix time */ - virtual std::time_t getUnixTime() = 0; + virtual MOCKPP_STD_NS::time_t getUnixTime() = 0; }; @@ -69,7 +69,7 @@ /** Returns the current unix time * @return unix time */ - virtual std::time_t getUnixTime(); + virtual MOCKPP_STD_NS::time_t getUnixTime(); }; Index: TimeServer.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/production/TimeServer.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- TimeServer.cpp 22 Mar 2006 19:13:34 -0000 1.10 +++ TimeServer.cpp 5 Apr 2006 17:03:40 -0000 1.11 @@ -35,9 +35,9 @@ MOCKPP_NS_START -std::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() +MOCKPP_STD_NS::time_t MOCKPP_EXPORT RealTimeServer::getUnixTime() { - return std::time(NULL); + return MOCKPP_STD_NS::time(NULL); } |