Update of /cvsroot/mockpp/mockpp/mockpp/compat
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv950/mockpp/compat
Modified Files:
Formatter.cpp Makefile.am
Log Message:
avoid name collision on win32
Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Makefile.am 19 Sep 2005 18:34:35 -0000 1.11
+++ Makefile.am 28 Dec 2005 21:28:47 -0000 1.12
@@ -5,13 +5,13 @@
libcompat_la_SOURCES = \
Exception.cpp \
- Assert.cpp \
+ Asserter.cpp \
Formatter.cpp \
AssertionFailedError.cpp
libcompatincludedir = $(includedir)/mockpp/compat
-libcompatinclude_HEADERS = Exception.h Assert.h Formatter.h \
+libcompatinclude_HEADERS = Exception.h Asserter.h Formatter.h \
AssertionFailedError.h
CLEANFILES = *.~* *.~~* *~ *.old
Index: Formatter.cpp
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/compat/Formatter.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- Formatter.cpp 28 Dec 2005 19:43:08 -0000 1.46
+++ Formatter.cpp 28 Dec 2005 21:28:47 -0000 1.47
@@ -34,7 +34,7 @@
#include <cctype>
#include <mockpp/compat/Formatter.h>
-#include <mockpp/compat/Assert.h>
+#include <mockpp/compat/Asserter.h>
#include <mockpp/compat/AssertionFailedError.h>
|
