Update of /cvsroot/mockpp/mockpp/mockpp/chaining
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10219/mockpp/chaining
Modified Files:
AbstractDynamicChainingMock.h InvocationMocker.h
Log Message:
re-introduced patch for BCB5
Index: InvocationMocker.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/InvocationMocker.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- InvocationMocker.h 4 Apr 2005 08:57:33 -0000 1.32
+++ InvocationMocker.h 7 Apr 2005 20:31:10 -0000 1.33
@@ -200,7 +200,7 @@
* @return The current content of the buffer data
*/
virtual String describeTo( String &result,
- const typename std::vector<InvocationMatcher<I>*> &matchers, // const InvocationMockerBase<R,I>::List &matchers
+ const typename std::vector<InvocationMatcher<I>*> &matchers,
Stub<R, I> *stub,
const String &name ) const = 0;
Index: AbstractDynamicChainingMock.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/chaining/AbstractDynamicChainingMock.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- AbstractDynamicChainingMock.h 6 Apr 2005 20:13:27 -0000 1.29
+++ AbstractDynamicChainingMock.h 7 Apr 2005 20:31:10 -0000 1.30
@@ -73,6 +73,8 @@
class Describer : public InvocationMocker<R, I>::DescriberBase
{
+ typedef InvocationMocker<R, I>::DescriberBase inherited;
+
public:
/** Does the object provide meaningful description via describeTo() ?.
@@ -99,7 +101,29 @@
return result;
}
+#ifdef __BORLANDC__
+
+ // prevent internal compiler error
+
+ /** Appends the description of this object to the buffer.
+ * @param result the buffer that the description is appended to.
+ * @param matchers a list of matcher objects
+ * @param stub pointer to the stub
+ * @param name the object's name
+ * @return The current content of the buffer data
+ */
+ String describeTo( String &result,
+ const typename std::vector<InvocationMatcher<I>*> &matchers,
+ TypelessStub<R>* stub,
+ const String &name ) const
+ {
+ return InvocationMocker<R, I>::DescriberBase::describeTo(result, matchers, adap.get(), name);
+ }
+
+#else
using InvocationMocker<R, I>::DescriberBase::describeTo;
+#endif
+
};
/** Verify that the expected value is within the allowed bounds.
|
