[Mockpp-commits] mockpp ChangeLog,1.101,1.102 configure.in,1.114,1.115 run-configure-unicode.sh,1.18,1.19

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

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

Modified Files:
	ChangeLog configure.in run-configure-unicode.sh 
Log Message:
optionally disable namespace

Index: run-configure-unicode.sh
===================================================================
RCS file: /cvsroot/mockpp/mockpp/run-configure-unicode.sh,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- run-configure-unicode.sh	15 Mar 2006 21:33:55 -0000	1.18
+++ run-configure-unicode.sh	19 Mar 2006 11:09:36 -0000	1.19
@@ -15,8 +15,9 @@
 echo MYCC: $MYCC
 
 #OPTS="--enable-doxygen --enable-docbook"
-OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
+#OPTS="$OPTS --enable-builtin-stl" # --disable-exceptions  --disable-rtti
 OPTS="$OPTS --enable-debug=full"
+#OPTS="$OPTS --disable-namespace"
 OPTS="$OPTS --disable-builtin-cxxtest --enable-cppunit"
 #OPTS="$OPTS --disable-builtin-cxxtest --enable-boosttest"
 

Index: ChangeLog
===================================================================
RCS file: /cvsroot/mockpp/mockpp/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- ChangeLog	15 Mar 2006 21:33:55 -0000	1.101
+++ ChangeLog	19 Mar 2006 11:09:36 -0000	1.102
@@ -5,8 +5,8 @@
 2006-03-16  1.11.4
 
  - added script to retrieve data from configure
- - added compiler switch to disable mockpp namespace
-   to enable older compilers
+ - added compiler switch to disable namespaces
+   for built-in sources to support older compilers
 
 2006-03-05  1.11.3
 

Index: configure.in
===================================================================
RCS file: /cvsroot/mockpp/mockpp/configure.in,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- configure.in	12 Mar 2006 08:25:53 -0000	1.114
+++ configure.in	19 Mar 2006 11:09:36 -0000	1.115
@@ -307,6 +307,32 @@
 AM_CONDITIONAL(BUILTIN_CXXTEST, test x$disable_builtin_cxxtest != xyes)
 
 dnl ------------------------------------------------------------------------
+
+AC_DEFUN([EA_DISABLE_NAMESPACE],
+[
+AC_ARG_ENABLE(disable_namespace, [  --disable-namespace do NOT use namespaces (no)], [disable_namespace=yes])
+
+if test x$disable_namespace = xyes; then
+  echo "*******************************************************"
+  echo "**  NOT using namespaces"
+  echo "*******************************************************"
+  AC_DEFINE(MOCKPP_NO_TYPENAME_FOR_STL_NS, 1, [restricted use of "typedef typename".])
+  AC_DEFINE(MOCKPP_NO_NAMESPACE, 1, [Define if you don't use mockpp namespace.])
+  AC_DEFINE(MINISTL_NO_NAMESPACE, 1, [Define if you don't use ministl namespace.])
+  AC_DEFINE(CXXTEST_NO_NAMESPACE, 1, [Define if you don't use CxxTest namespace.])
+else
+  echo "*******************************************************"
+  echo "**  normally using namespaces"
+  echo "*******************************************************"
+  AH_TEMPLATE([MOCKPP_NO_TYPENAME_FOR_STL_NS], [restricted use of "typedef typename".])
+  AH_TEMPLATE([MOCKPP_NO_NAMESPACE], [Define if you don't use mockpp namespace.])
+  AH_TEMPLATE([MINISTL_NO_NAMESPACE], [Define if you don't use ministl namespace.])
+  AH_TEMPLATE([CXXTEST_NO_NAMESPACE], [Define if you don't use CxxTest namespace.])
+fi
+])
+AM_CONDITIONAL(DISABLE_NAMESPACE, test x$disable_namespace != xyes)
+
+dnl ------------------------------------------------------------------------
 dnl Find a file (or one of more files in a list of dirs)
 dnl params: filename path result(NO = none)
 dnl ------------------------------------------------------------------------
@@ -388,12 +414,42 @@
 
 # ----------------------------------------------------------------------------
 
+AC_DEFUN([EA_CHECK_STD_NUMERICLIMITS],
+[
+
+AC_MSG_CHECKING([for std::numeric_limits])
+AC_LANG_SAVE
+AC_LANG_CPLUSPLUS
+
+cat > conftest.$ac_ext <<EOF
+#include <limits>
+int main()
+{
+  return (int) std::numeric_limits<unsigned>::max();
+}
+EOF
+
+ac_compile_link='${CXX} $CXXFLAGS $all_includes $all_libraries $CPPFLAGS conftest.$ac_ext'
+if AC_TRY_EVAL(ac_compile_link); then
+  AC_MSG_RESULT(yes)
+else
+  AC_DEFINE(MOCKPP_NO_STD_NUMERICLIMITS, 1, [Define if the std::numeric_limits templates are missing.])
+  AC_MSG_RESULT(no)
+fi
+
+AC_SUBST(MOCKPP_NO_STD_NUMERICLIMITS)
+AC_LANG_RESTORE
+])
+
+# ----------------------------------------------------------------------------
+
 AC_CXX_RTTI
 
 EA_DISABLE_EXCEPTIONS
 EA_DISABLE_RTTI
 EA_BUILTIN_STL
 EA_BUILTIN_CXXTEST
+EA_DISABLE_NAMESPACE
 EA_ENABLE_DOCBOOK
 EA_CHECK_LIBDL
 EA_ENABLE_DOXYGEN
@@ -402,6 +458,7 @@
 EA_CHECK_WSTRING
 EA_CHECK_WCSCMP
 EA_CHECK_STD_WCSCMP
+EA_CHECK_STD_NUMERICLIMITS
 EA_CHECK_LIBCPPUNIT
 EA_CHECK_BOOSTTEST