[Mockpp-commits] mockpp/mockpp AbstractExpectation.h,1.24,1.25 Makefile.am,1.103,1.104 Throwable.cpp,1.14,1.15 ThrowableList.cpp,1.23,1.24 TrackingCounter.cpp,1.11,1.12 VerifiableList.cpp,1.19,1.20

[Ewald A. <ewa...@us...>]

Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1334/mockpp

Modified Files:
	AbstractExpectation.h Makefile.am Throwable.cpp 
	ThrowableList.cpp TrackingCounter.cpp VerifiableList.cpp 
Log Message:
avoid name collision on win32 

Index: TrackingCounter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/TrackingCounter.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- TrackingCounter.cpp	26 Nov 2005 18:00:17 -0000	1.11
+++ TrackingCounter.cpp	28 Dec 2005 21:30:16 -0000	1.12
@@ -34,7 +34,7 @@
 #include <mockpp/TrackingCounter.h>
 #include <mockpp/VerifiableList.h>
 
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
 
 #include <mockpp/compat/Formatter.h>
 

Index: VerifiableList.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/VerifiableList.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- VerifiableList.cpp	26 Nov 2005 18:00:17 -0000	1.19
+++ VerifiableList.cpp	28 Dec 2005 21:30:16 -0000	1.20
@@ -34,7 +34,7 @@
 #include MOCKPP_ALGORITHM_H
 
 #include <mockpp/VerifiableList.h>
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
 
 
 namespace mockpp {

Index: ThrowableList.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/ThrowableList.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ThrowableList.cpp	26 Nov 2005 18:27:30 -0000	1.23
+++ ThrowableList.cpp	28 Dec 2005 21:30:16 -0000	1.24
@@ -29,7 +29,7 @@
 
 #include <mockpp/mockpp.h> // always first
 
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
 #include <mockpp/compat/Formatter.h>
 
 #include <mockpp/ThrowableList.h>

Index: Throwable.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Throwable.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- Throwable.cpp	13 Nov 2005 11:53:18 -0000	1.14
+++ Throwable.cpp	28 Dec 2005 21:30:16 -0000	1.15
@@ -30,7 +30,7 @@
 
 #include <mockpp/mockpp.h> // always first
 
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
 
 #include <mockpp/Throwable.h>
 

Index: AbstractExpectation.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/AbstractExpectation.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- AbstractExpectation.h	7 May 2005 12:45:10 -0000	1.24
+++ AbstractExpectation.h	28 Dec 2005 21:30:16 -0000	1.25
@@ -34,7 +34,7 @@
 #include <mockpp/mockpp.h> // always first
 
 #include <mockpp/Expectation.h>
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
 #include <mockpp/compat/Formatter.h>
 
 

Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- Makefile.am	28 Dec 2005 19:43:08 -0000	1.103
+++ Makefile.am	28 Dec 2005 21:30:16 -0000	1.104
@@ -84,6 +84,7 @@
 
 mockpp_config-bcb5.h:
 	perl  -i.bak -pe "s/(.*mockpp_production)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g"  $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg
+	perl  -i.bak -pe "s/(.*mockpp_cxxtest)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g"     $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg
 	perl  -i.bak -pe "s/\\\\(mockpp)_(\d*)\\\\/\\\\\1_$(LT_CURRENT)\\\\/g"              $(top_srcdir)/bcb5/*.bpr
 	perl  -i.bak -pe "s/\\\\(mockpp)_(\d*)/\\\\\1_$(LT_CURRENT)/g"                      $(top_srcdir)/bcb5/*.bat
 	perl  -i.bak -pe "s/(.*mockpp)_(\d*)(\.lib|\.dll)/\1_$(LT_CURRENT)\3/g"             $(top_srcdir)/bcb5/*.bpr $(top_srcdir)/bcb5/*.bpf $(top_srcdir)/bcb5/*.bpg