Always assume ADOLC_USE_CALLOC

Without that flag the code doesn't even compile anymore.

Author: osander1

ADOL-C/doc/adolc-manual.tex

@@ -968,12 +968,6 @@ \subsection{Customizing ADOL-C}
   undefined) by passing \texttt{--enable-atrig-erf}
   to \texttt{./configure}
 
-\item[{\sf ADOLC\_USE\_CALLOC}{\rm :}] Selects the memory allocation routine
-  used by ADOL-C. {\sf Malloc} will be used if this variable is
-  undefined. {\sf ADOLC\_USE\_CALLOC} is defined by default to avoid incorrect
-  result caused by uninitialized memory. It can be set undefined by
-  passing \texttt{--disable-use-calloc} to \texttt{./configure}.
-
 \item[{\sf ADOLC\_ADVANCED\_BRANCHING}{\rm :}] Enables routines
   required for automatic branch selection (default: disabled). The
   boolean valued comparison operators with two \texttt{adouble} type

ADOL-C/src/adalloc.c

@@ -21,19 +21,11 @@
 #else
 #   define ADOLC_CALLOC(n,m) rpl_calloc(n,m)
 #endif
-#if defined(ADOLC_USE_CALLOC)
 #  if !defined(ADOLC_NO_MALLOC)
 #     define ADOLC_MALLOC(n,m) calloc(n,m)
 #  else
 #     define ADOLC_MALLOC(n,m) rpl_calloc(n,m)
 #  endif
-#else
-#  if !defined(ADOLC_NO_MALLOC)
-#     define ADOLC_MALLOC(n,m) malloc(n*m)
-#  else
-#     define ADOLC_MALLOC(n,m) rpl_malloc(n*m)
-#  endif
-#endif
 
 BEGIN_C_DECLS
 

ADOL-C/src/drivers/psdrivers.c

@@ -123,10 +123,6 @@ int directional_active_gradient(short tag,      /* trace identifier */
   gradu = (double**)myalloc2(s,n);
   E = (double**)myalloc2(n,n);
 
-#if !defined(ADOLC_USE_CALLOC)
-  memset(&(E[0][0]), 0, n*n*sizeof(double));
-#endif
-
   max_dk=0;
   max_entry = -1;
   for(i=0;i<n;i++){

ADOL-C/src/fo_rev.c

@@ -489,12 +489,6 @@ int int_reverse_safe(
             sizeof(revreal));
     if (rp_T == NULL) fail(ADOLC_MALLOC_FAILED);
     ADOLC_CURRENT_TAPE_INFOS.workMode = ADOLC_FOV_REVERSE;
-#if !defined(ADOLC_USE_CALLOC)
-    c_Ptr = (char *) ADOLC_GLOBAL_TAPE_VARS.dpp_A;
-    *c_Ptr = 0;
-    memcpy(c_Ptr + 1, c_Ptr, sizeof(double) * p *
-            ADOLC_CURRENT_TAPE_INFOS.stats[NUM_MAX_LIVES] - 1);
-#endif
 # define ADJOINT_BUFFER rpp_A
 # define ADJOINT_BUFFER_ARG_L rpp_A[arg][l]
 # define ADJOINT_BUFFER_RES_L rpp_A[res][l]

configure.ac

@@ -154,18 +154,6 @@ if test x$ac_cv_func_malloc_0_nonnull != xyes ; then
 AC_DEFINE_UNQUOTED([calloc],[rpl_calloc],[Define to rpl_calloc if the replacement function should be used.])
 fi
 
-AC_MSG_CHECKING(whether to use calloc or malloc for memory allocation)
-AC_ARG_ENABLE(use-calloc,[AS_HELP_STRING([--disable-use-calloc],
-  [disable use of calloc and use malloc instead for memory allocation [default=calloc is used]])],
-  [use_calloc=$enableval],[use_calloc=yes])
-
-if test x$use_calloc = xyes ; then
-AC_MSG_RESULT(calloc)
-AC_DEFINE(ADOLC_USE_CALLOC,1,[Use calloc instead of malloc for memory allocation])
-else
-AC_MSG_RESULT(malloc)
-fi
-
 AC_MSG_CHECKING(whether to use 32-bit or 64-bit locations)
 AC_ARG_ENABLE(ulong,[AS_HELP_STRING([--enable-ulong],
   [enable 64-bit locations (only available on 64-bit systems) [default=32-bit]])],