[Mockpp-commits] mockpp/mockpp/visiting VisitableMockMethod.cpp,1.4,1.5 VisitableMockMethod.h,1.4,1.
Brought to you by:
ewald-arnold
Menu
▾
▴
[Mockpp-commits] mockpp/mockpp/visiting VisitableMockMethod.cpp,1.4,1.5 VisitableMockMethod.h,1.4,1.5 VisitableMockObject.h,1.5,1.6 VisitableMockObject_macro.h,1.3,1.4
|
From: Ewald A. <ewa...@us...> - 2006-04-05 17:04:34
|
Update of /cvsroot/mockpp/mockpp/mockpp/visiting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19970/mockpp/visiting Modified Files: VisitableMockMethod.cpp VisitableMockMethod.h VisitableMockObject.h VisitableMockObject_macro.h Log Message: more namespace disabling Index: VisitableMockMethod.cpp =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockMethod.cpp 15 Mar 2006 21:34:09 -0000 1.4 +++ VisitableMockMethod.cpp 5 Apr 2006 17:03:41 -0000 1.5 @@ -38,7 +38,7 @@ MOCKPP_EXPORT VisitableMockMethodBase::VisitableMockMethodBase(const String &name, - VisitableMockObject *parent) + VisitableMockObject *parent) : MockObject(name, parent) , visitable(parent) , throwables (name + MOCKPP_PCHAR("/throwables"), this) Index: VisitableMockMethod.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockMethod.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- VisitableMockMethod.h 15 Mar 2006 21:34:09 -0000 1.4 +++ VisitableMockMethod.h 5 Apr 2006 17:03:41 -0000 1.5 @@ -116,8 +116,8 @@ */ void addThrowable(Throwable *t) { - std::auto_ptr<Throwable> at (t); - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_STD_NS::auto_ptr<Throwable> at (t); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); this->throwables.push_back(at.release()); this->throwableInsteadReturn.push_back(true); } @@ -142,8 +142,8 @@ */ void setDefaultThrowable(Throwable *t) { - std::auto_ptr<Throwable> at (t); - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_STD_NS::auto_ptr<Throwable> at (t); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); this->defaultThrowable.take(at.release()); } @@ -213,7 +213,7 @@ */ void setDefaultReturnValue(const R &rv) { - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); this->haveDefaultReturnValue = true; this->defaultReturnValue = rv; } @@ -226,7 +226,7 @@ */ void addReturnValue(const R &rv, unsigned count = 1) { - MOCKPP_ASSERT_FALSE(getVisitableMockObject()->isActivated()); + MOCKPP_ASSERT_FALSE(this->getVisitableMockObject()->isActivated()); for ( ; count > 0; --count) { this->returnValues.addObjectToReturn(rv); Index: VisitableMockObject.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- VisitableMockObject.h 15 Mar 2006 21:34:10 -0000 1.5 +++ VisitableMockObject.h 5 Apr 2006 17:03:41 -0000 1.6 @@ -262,7 +262,7 @@ */ void addResponseValue (const your_type &rv, const your_type1 &p1, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -273,7 +273,7 @@ */ void addResponseThrowable (Throwable *t, const your_type1 &p1, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -307,7 +307,7 @@ */ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -319,7 +319,7 @@ */ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -358,7 +358,7 @@ */ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -371,7 +371,7 @@ */ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -416,7 +416,7 @@ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -431,7 +431,7 @@ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the @@ -481,7 +481,7 @@ void addResponseValue (const your_type &rv, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, const your_type5 &p5, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response throwable. * Response throwables are determined on the parameters you pass. This way the @@ -497,7 +497,7 @@ void addResponseThrowable (Throwable *t, const your_type1 &p1, const your_type2 &p2, const your_type3 &p3, const your_type4 &p4, const your_type5 &p5, - unsigned count = std::numeric_limits < unsigned >::max ()); + unsigned count = MOCKPP_UNLIMITED); /** Adds another response value. * Response values are determined on the parameter constraints you pass. This way the Index: VisitableMockObject_macro.h =================================================================== RCS file: /cvsroot/mockpp/mockpp/mockpp/visiting/VisitableMockObject_macro.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- VisitableMockObject_macro.h 15 Mar 2006 21:34:10 -0000 1.3 +++ VisitableMockObject_macro.h 5 Apr 2006 17:03:41 -0000 1.4 @@ -195,7 +195,7 @@ #define MOCKPP_CONTROLLER_IMPL_THROW(methname) \ void addThrowable(MOCKPP_NS::Throwable *t_) \ { \ - std::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ + MOCKPP_STD_NS::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## Throwables.push_back(at.release()); \ objptr->methname ## ThrowableInsteadReturn.push_back(true); \ @@ -210,7 +210,7 @@ \ void setDefaultThrowable(MOCKPP_NS::Throwable *t_) \ { \ - std::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ + MOCKPP_STD_NS::auto_ptr<MOCKPP_NS::Throwable> at (t_); \ MOCKPP_ASSERT_FALSE(objptr->isActivated()); \ objptr->methname ## DefaultThrowable.take(at.release()); \ } |
