Update of /cvsroot/mockpp/mockpp/mockpp/stub
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3635/mockpp/stub
Modified Files:
StubHolder.h ThrowStub.h TypelessStub.h
Log Message:
more fixes for msvc6
Index: StubHolder.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubHolder.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- StubHolder.h 30 Jan 2005 12:09:18 -0000 1.9
+++ StubHolder.h 2 Apr 2005 20:45:31 -0000 1.10
@@ -76,7 +76,7 @@
/** Creates the object.
* @param in_stub pointer to the stub
*/
- StubHolder(const typename Stub<R, I>::AP &in_stub)
+ StubHolder(const AutoPointer<Stub<R, I> > &in_stub)
: stub(in_stub)
{}
@@ -84,11 +84,7 @@
* @attention After this method is called this object becomes invalid.
* @return the stub object
*/
-#if defined(__BORLANDC__) && (__BORLANDC__ >= 560)
- operator typename AutoPointer<Stub<R, I> > () const // we we actually lie a bit
-#else
- operator typename Stub<R, I>::AP () const
-#endif
+ operator AutoPointer<Stub<R, I> > () const // we we actually lie a bit
{
return stub;
}
Index: TypelessStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStub.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- TypelessStub.h 25 Mar 2005 16:30:30 -0000 1.14
+++ TypelessStub.h 2 Apr 2005 20:45:32 -0000 1.15
@@ -183,7 +183,7 @@
*/
#define MOCKPP_TYPELESSSTUBADAPTER_PTI_DECL(I) \
template<> \
-void mockpp::TypelessStubAdapter<void, I>::invoke( const I &);
+void mockpp::TypelessStubAdapter<void, I >::invoke( const I &);
/** Implement specialized methods for mockpp::InvocationMocker.
@@ -191,7 +191,7 @@
*/
#define MOCKPP_TYPELESSSTUBADAPTER_PTI_IMPL(I) \
template<> \
-void mockpp::TypelessStubAdapter<void, I>::invoke( const I &invocation) \
+void mockpp::TypelessStubAdapter<void, I >::invoke( const I &invocation) \
{ \
this->stubber->typelessInvoke(); \
}
Index: ThrowStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ThrowStub.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- ThrowStub.h 2 Apr 2005 13:46:32 -0000 1.29
+++ ThrowStub.h 2 Apr 2005 20:45:32 -0000 1.30
@@ -160,7 +160,7 @@
*/
#define MOCKPP_THROWSTUB_PTI_DECL \
template<> \
-void ::mockpp::ThrowStub<void>::typelessInvoke(); \
+void mockpp::ThrowStub<void>::typelessInvoke(); \
/** Implement specialized methods for mockpp::InvocationMocker.
@@ -168,10 +168,10 @@
*/
#define MOCKPP_THROWSTUB_PTI_IMPL \
template<> \
-void ::mockpp::ThrowStub<void>::typelessInvoke() \
+void mockpp::ThrowStub<void>::typelessInvoke() \
{ \
this->throwable.get()->throw_me(); \
-}
+}
#endif // MOCKPP_PTI_WEAKNESS
|
