Update of /cvsroot/mockpp/mockpp/mockpp/stub
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1020/mockpp/stub
Modified Files:
ReturnStub.h StubSequence.h TypelessStubSequence.h
Log Message:
avoid name collision on win32
Index: TypelessStubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/TypelessStubSequence.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- TypelessStubSequence.h 26 Nov 2005 20:16:55 -0000 1.9
+++ TypelessStubSequence.h 28 Dec 2005 21:29:19 -0000 1.10
@@ -35,7 +35,7 @@
#include MOCKPP_VECTOR_H
#include <mockpp/stub/TypelessStub.h>
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
namespace mockpp {
Index: ReturnStub.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/ReturnStub.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- ReturnStub.h 6 Jan 2005 13:09:23 -0000 1.19
+++ ReturnStub.h 28 Dec 2005 21:29:19 -0000 1.20
@@ -37,7 +37,7 @@
#include <mockpp/mockpp.h> // always first
#include <mockpp/compat/Formatter.h>
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
#include <mockpp/stub/TypelessStub.h>
Index: StubSequence.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/stub/StubSequence.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- StubSequence.h 26 Nov 2005 20:16:55 -0000 1.27
+++ StubSequence.h 28 Dec 2005 21:29:19 -0000 1.28
@@ -39,7 +39,7 @@
#include MOCKPP_VECTOR_H
#include <mockpp/stub/Stub.h>
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
namespace mockpp {
|
