Changeset 672783 in git


Ignore:
Timestamp:
Jul 28, 2009, 4:59:52 PM (15 years ago)
Author:
Hans Schönemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
7b87efd89885ee6835475300c291481f6c035bb7
Parents:
a07e45cfc61927c5711cee673474fb891d4574ac
Message:
*hannes: restore old version


git-svn-id: file:///usr/local/Singular/svn/trunk@12031 2c84dea3-7e68-4137-9b89-c4e89433aadc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/tesths.cc

    ra07e45 r672783  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: tesths.cc,v 1.116 2009-07-28 14:19:05 Singular Exp $ */
     4/* $Id: tesths.cc,v 1.117 2009-07-28 14:59:52 Singular Exp $ */
    55
    66/*
     
    4848#endif
    4949
    50 #if (! defined(LIBSINGULAR)) || defined(GENTABLE)
     50#if ! defined(LIBSINGULAR)
    5151/*0 implementation*/
    5252int main(          /* main entry to Singular */
     
    5454    char** argv)   /* parameter array */
    5555{
    56 // do not call mp_set_memory_functions in LIBSINGULAR:
    57 #if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
    58     /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
    59     /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
    60     /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
    61     /* do not rely on the default in Singular as libsingular may be different */
    62     mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
    63 #else
    64     mp_set_memory_functions(malloc,reallocSize,freeSize);
    65 #endif
    6656#ifdef HAVE_FACTORY
    6757  On(SW_USE_NTL);
     
    143133  /* say hello */
    144134  {
     135#ifdef HAVE_NS
    145136    basePack=(package)omAlloc0(sizeof(*basePack));
    146137    currPack=basePack;
     
    151142    currPackHdl=h;
    152143    basePackHdl=h;
     144#endif /* HAVE_NS */
    153145  }
    154146  if (BVERBOSE(0))
  • kernel/mminit.cc

    ra07e45 r672783  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 /* $Id: mminit.cc,v 1.5 2009-07-28 14:15:05 Singular Exp $ */
     4/* $Id: mminit.cc,v 1.6 2009-07-28 14:59:30 Singular Exp $ */
    55/*
    66* ABSTRACT: init of memory management
     
    3838  if(mmIsInitialized==0)
    3939  {
     40#if defined(OMALLOC_USES_MALLOC) || defined(X_OMALLOC)
     41    /* in mmstd.c, for some architectures freeSize() unconditionally uses the *system* free() */
     42    /* sage ticket 5344: http://trac.sagemath.org/sage_trac/ticket/5344 */
     43    /* solution: correctly check OMALLOC_USES_MALLOC from omalloc.h, */
     44    /* do not rely on the default in Singular as libsingular may be different */
     45    mp_set_memory_functions(omMallocFunc,omReallocSizeFunc,omFreeSizeFunc);
     46#else
     47    mp_set_memory_functions(malloc,reallocSize,freeSize);
     48#endif
    4049    om_Opts.OutOfMemoryFunc = omSingOutOfMemoryFunc;
    4150#ifndef OM_NDEBUG
Note: See TracChangeset for help on using the changeset viewer.