Update of /cvsroot/mockpp/mockpp/mockpp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27352/mockpp
Modified Files:
Makefile.am mockpp.h
Log Message:
integration cxxtest + ministl
Index: mockpp.h
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/mockpp.h,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- mockpp.h 3 Dec 2005 13:10:12 -0000 1.66
+++ mockpp.h 18 Dec 2005 16:56:23 -0000 1.67
@@ -107,12 +107,7 @@
// msvc70 is 1300
// msvc71 is 1310
#ifdef _MSC_VER
-# if _MSC_VER <= 1300
-# define _MSC_VER_60_70
-# include <mockpp/mockpp_config-msvc_60_70.h>
-# else
# include <mockpp/mockpp_config-msvc_71.h>
-# endif
#elif defined(__BORLANDC__)
# include <mockpp/mockpp_config-bcb5.h>
@@ -122,7 +117,6 @@
# include <config.h>
# else
# include <mockpp/mockpp_config.h>
-//# include <mockpp/mockpp_config-cygwin.h>
# endif
#else
@@ -166,7 +160,6 @@
#define MOCKPP_SET_H <ministl/set>
#define MOCKPP_ALGORITHM_H <ministl/algorithm>
#define MOCKPP_FUNCTION_H <ministl/function>
-#define MOCKPP_DEQUE_H <ministl/deque>
// namespace ministl
#define MOCKPP_STL ministl
@@ -178,7 +171,6 @@
#define MOCKPP_STRING_H <string>
#define MOCKPP_VECTOR_H <vector>
#define MOCKPP_MAP_H <map>
-#define MOCKPP_DEQUE_H <deque>
#define MOCKPP_SET_H <set>
#define MOCKPP_FUNCTION_H <function>
#define MOCKPP_ALGORITHM_H <algorithm>
Index: Makefile.am
===================================================================
RCS file: /cvsroot/mockpp/mockpp/mockpp/Makefile.am,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- Makefile.am 10 Dec 2005 20:07:21 -0000 1.99
+++ Makefile.am 18 Dec 2005 16:56:23 -0000 1.100
@@ -95,7 +95,8 @@
grep HAVE_LIMITS ../config.h >>$@
grep HAVE_WSTRING ../config.h >>$@
grep HAVE_VALUES ../config.h >>$@
- grep MOCKPP_USE_MINI_STL ../config.h >>$@
+ grep MOCKPP_USE_MINI_STL ../config.h >>$@
+ grep CXXTEST_USE_MINI_STL ../config.h >>$@
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
|
