Changeset 650f2d8 in git


Ignore:
Timestamp:
May 10, 2011, 4:26:31 PM (13 years ago)
Author:
Mohamed Barakat <mohamed.barakat@…>
Branches:
(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')
Children:
468b57665e41eeb23c67a98dd6a2f85ccce65137
Parents:
b58d4735ba8885b68e60e175df833c691cd3c04e
git-author:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-05-10 16:26:31+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:43+01:00
Message:
renamed assert.h -> cf_assert.h in factory
Location:
factory
Files:
78 edited
1 moved

Legend:

Unmodified
Added
Removed
  • factory/CMakeLists.txt

    rb58d47 r650f2d8  
    197197# factory header files
    198198set(basefactory_hdrs
    199                 assert.h
     199                cf_assert.h
    200200                canonicalform.h
    201201                cf_algorithm.h
  • factory/ChangeLog

    rb58d47 r650f2d8  
    920920Fri Sep 26 12:54:41 1997  Jens Schmidt  <schmidt@mathematik.uni-kl.de>
    921921
    922         * assert.h: prints the function now where the assrtion occured if
     922        * cf_assert.h: prints the function now where the assrtion occured if
    923923          we are translating with gcc
    924924
     
    16061606        If we refer to the "DEBOUT macros", the "ASSERT macros", or the
    16071607        "TIMING macros" we mean one (or more) of the macros defined in
    1608         debug.h, assert.h, and timing.h, resp.
    1609 
    1610         * assert.h (NOASSERT, NDEBUG): #define NDEBUG to switch off
     1608        debug.h, cf_assert.h, and timing.h, resp.
     1609
     1610        * cf_assert.h (NOASSERT, NDEBUG): #define NDEBUG to switch off
    16111611          assertions replaced by #define NOASSERT.  For sake of backward
    16121612          compatibility NDEBUG works, too.
    16131613
    1614         * assert.h (DEBINCLEVEL, DEBDECLEVEL, DEBOUTSL, DEBOUT, DEBOUTLN):
     1614        * cf_assert.h (DEBINCLEVEL, DEBDECLEVEL, DEBOUTSL, DEBOUT, DEBOUTLN):
    16151615          DEBOUT macros moved to debug.h
    16161616        * assert.cc: renamed to debug.cc
    16171617        * debug.h, debug.cc: new files.  DEBOUT macros moved from
    1618           assert.h/assert.cc to debug.h/debug.cc.  All source files which
     1618          cf_assert.h/assert.cc to debug.h/debug.cc.  All source files which
    16191619          need these macros include debug.h.
    16201620
    1621         * assert.h (PVIRT_VOID, PVIRT_INTCF, PVIRT_BOOL, PVIRT_INT,
    1622           PVIRT_CHARCC): PVIRT_*-macros moved from int_cf.h to assert.h
     1621        * cf_assert.h (PVIRT_VOID, PVIRT_INTCF, PVIRT_BOOL, PVIRT_INT,
     1622          PVIRT_CHARCC): PVIRT_*-macros moved from int_cf.h to cf_assert.h
    16231623        * int_cf.h (PVIRT_VOID, PVIRT_INTCF, PVIRT_BOOL, PVIRT_INT,
    1624           PVIRT_CHARCC): PVIRT_*-macros moved to assert.h
    1625 
    1626         * assert.h (__ASSERT, __STICKYASSERT): the preprocessor instead of
     1624          PVIRT_CHARCC): PVIRT_*-macros moved to cf_assert.h
     1625
     1626        * cf_assert.h (__ASSERT, __STICKYASSERT): the preprocessor instead of
    16271627          fprintf() pastes the message into the format string now
    16281628
    1629         * assert.h (__ASSERT1, ASSERT1, STICKYASSERT1): new macros
    1630 
    1631         * assert.h (__WARN, WARN, STICKYWARN): new macros
     1629        * cf_assert.h (__ASSERT1, ASSERT1, STICKYASSERT1): new macros
     1630
     1631        * cf_assert.h (__WARN, WARN, STICKYWARN): new macros
    16321632
    16331633        * canonicalform.cc (operator>>): dependency on #define SINGULAR
  • factory/DegreePattern.h

    rb58d47 r650f2d8  
    1717#include <config.h>
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include "canonicalform.h"
  • factory/GNUmakefile.in

    rb58d47 r650f2d8  
    225225# factory header files
    226226basefactoryincl := \
    227                 assert.h \
     227                cf_assert.h \
    228228                canonicalform.h \
    229229                cf_algorithm.h \
  • factory/Makefile.am

    rb58d47 r650f2d8  
    8080# factory header files
    8181HEADERS := \
    82                 assert.h \
     82                cf_assert.h \
    8383                canonicalform.h \
    8484                cf_algorithm.h \
  • factory/NTLconvert.cc

    rb58d47 r650f2d8  
    22#include <config.h>
    33
    4 #include "assert.h"
     4#include "cf_assert.h"
    55
    66#include "cf_defs.h"
  • factory/NTLconvert.h

    rb58d47 r650f2d8  
    77#include "cf_gmp.h"
    88
    9 #include "assert.h"
     9#include "cf_assert.h"
    1010
    1111#include "cf_defs.h"
  • factory/README

    rb58d47 r650f2d8  
    200200======================
    201201Factory has three types of diagnostic messages:
    202 o Assertions (implemented by the "ASSERT macros" in `assert.h') are used to
     202o Assertions (implemented by the "ASSERT macros" in `cf_assert.h') are used to
    203203  ensure preconditions before running some algorithm.  A typical example is
    204204  to test f != 0 before dividing by f.
     
    524524newdelete.cc    - C++ interface to the memory managers
    525525
    526 assert.h        - the "ASSERT macros"
     526cf_assert.h     - the "ASSERT macros"
    527527debug.h
    528528debug.cc        - the "DEBOUT macros"
  • factory/canonicalform.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_factory.h"
  • factory/cf_algorithm.cc

    rb58d47 r650f2d8  
    2121#include <config.h>
    2222
    23 #include "assert.h"
     23#include "cf_assert.h"
    2424
    2525#include "cf_factory.h"
  • factory/cf_assert.h

    rb58d47 r650f2d8  
    22/* $Id$ */
    33
    4 /* This is for compatibility with standard assert.h */
     4/* This is for compatibility with standard cf_assert.h */
    55#if defined (NDEBUG) && ! defined (NOASSERT)
    66#define NOASSERT
  • factory/cf_binom.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_char.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_chinese.cc

    rb58d47 r650f2d8  
    1414#include <config.h>
    1515
    16 #include "assert.h"
     16#include "cf_assert.h"
    1717#include "debug.h"
    1818
  • factory/cf_eval.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_factor.cc

    rb58d47 r650f2d8  
    1414#include <config.h>
    1515
    16 #include "assert.h"
     16#include "cf_assert.h"
    1717
    1818#include "cf_defs.h"
  • factory/cf_factory.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_gcd.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88
  • factory/cf_gcd_smallp.cc

    • Property mode changed from 100755 to 100644
    rb58d47 r650f2d8  
    2121#include <config.h>
    2222
    23 #include "assert.h"
     23#include "cf_assert.h"
    2424#include "debug.h"
    2525#include "timing.h"
  • factory/cf_gcd_smallp.h

    rb58d47 r650f2d8  
    2424
    2525#include <config.h>
    26 #include "assert.h"
     26#include "cf_assert.h"
    2727
    2828CanonicalForm GCD_Fp_extension (const CanonicalForm& F, const CanonicalForm& G,
  • factory/cf_generator.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_inline.cc

    rb58d47 r650f2d8  
    7777#include <config.h>
    7878
    79 #include "assert.h"
     79#include "cf_assert.h"
    8080
    8181// temporarily switch off `CF_USE_INLINE' and include
  • factory/cf_irred.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_iter.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_iter_inline.cc

    rb58d47 r650f2d8  
    2424#include <config.h>
    2525
    26 #include "assert.h"
     26#include "cf_assert.h"
    2727
    2828// regular include file
  • factory/cf_linsys.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88#include "timing.h"
  • factory/cf_map_ext.cc

    rb58d47 r650f2d8  
    1919#include <config.h>
    2020
    21 #include "assert.h"
     21#include "cf_assert.h"
    2222#include "debug.h"
    2323
  • factory/cf_ops.cc

    rb58d47 r650f2d8  
    2222#include <config.h>
    2323
    24 #include "assert.h"
     24#include "cf_assert.h"
    2525
    2626#include "canonicalform.h"
  • factory/cf_primes.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/cf_random.cc

    rb58d47 r650f2d8  
    66#include <time.h>
    77
    8 #include "assert.h"
     8#include "cf_assert.h"
    99
    1010#include "cf_defs.h"
  • factory/cf_resultant.cc

    rb58d47 r650f2d8  
    1212#include <config.h>
    1313
    14 #include "assert.h"
     14#include "cf_assert.h"
    1515
    1616#include "canonicalform.h"
  • factory/cf_reval.cc

    rb58d47 r650f2d8  
    66#include <config.h>
    77
    8 #include "assert.h"
     8#include "cf_assert.h"
    99
    1010#include "cf_defs.h"
  • factory/facAlgExt.cc

    • Property mode changed from 100755 to 100644
    rb58d47 r650f2d8  
    2020#include <config.h>
    2121
    22 #include "assert.h"
     22#include "cf_assert.h"
    2323#include "debug.h"
    2424#include "timing.h"
  • factory/facAlgExt.h

    • Property mode changed from 100755 to 100644
    rb58d47 r650f2d8  
    2222#define FAC_ALG_EXT_H
    2323
    24 #include "assert.h"
     24#include "cf_assert.h"
    2525
    2626#include "canonicalform.h"
  • factory/facFqBivar.cc

    rb58d47 r650f2d8  
    2121#include <config.h>
    2222
    23 #include "assert.h"
     23#include "cf_assert.h"
    2424#include "debug.h"
    2525#include "timing.h"
  • factory/facFqBivar.h

    rb58d47 r650f2d8  
    1919#include <config.h>
    2020
    21 #include "assert.h"
     21#include "cf_assert.h"
    2222
    2323#include "facFqBivarUtil.h"
  • factory/facFqFactorize.cc

    rb58d47 r650f2d8  
    2020#include <config.h>
    2121
    22 #include "assert.h"
     22#include "cf_assert.h"
    2323#include "debug.h"
    2424#include "timing.h"
  • factory/facFqSquarefree.h

    rb58d47 r650f2d8  
    1717#define FAC_FQ_SQUAREFREE_H
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121
  • factory/facHensel.cc

    rb58d47 r650f2d8  
    2020/*****************************************************************************/
    2121
    22 #include "assert.h"
     22#include "cf_assert.h"
    2323#include "debug.h"
    2424#include "timing.h"
  • factory/facHensel.h

    rb58d47 r650f2d8  
    2020
    2121#include <config.h>
    22 #include "assert.h"
     22#include "cf_assert.h"
    2323#include "debug.h"
    2424#include "timing.h"
  • factory/fac_berlekamp.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88
  • factory/fac_cantzass.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/fac_distrib.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88
  • factory/fac_ezgcd.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88
  • factory/fac_iterfor.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/fac_multihensel.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88#include "timing.h"
  • factory/fac_multivar.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77#include "debug.h"
    88#include "timing.h"
  • factory/fac_sqrfree.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/fac_univar.cc

    rb58d47 r650f2d8  
    66#include <math.h>
    77
    8 #include "assert.h"
     8#include "cf_assert.h"
    99#include "debug.h"
    1010#include "timing.h"
  • factory/fac_util.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/factoryconf.template

    rb58d47 r650f2d8  
    1313 * way as `config.h' serves as a configuration file for the
    1414 * source files from which the library is build.  Additionally,
    15  * we paste a copy of our `assert.h' into this file which is
     15 * we paste a copy of our `cf_assert.h' into this file which is
    1616 * necessary for the templates to translate.
    1717 *
     
    2323
    2424/*MAKEHEADER*/
    25 #include "assert.h"
     25#include "cf_assert.h"
    2626
    2727#endif /* ! INCL_FACTORYCONF_H */
  • factory/ffops.cc

    rb58d47 r650f2d8  
    66#include <string.h>
    77
    8 #include "assert.h"
     8#include "cf_assert.h"
    99
    1010#include "cf_defs.h"
  • factory/ftest/ntl_util.cc

    rb58d47 r650f2d8  
    2020#include <strstream.h>
    2121
    22 #include <assert.h>
     22#include <cf_assert.h>
    2323
    2424#include "ntl_util.h"
  • factory/gengftables-conway.cc

    rb58d47 r650f2d8  
    1818#include <factory.h>
    1919
    20 #include <assert.h>
     20#include <cf_assert.h>
    2121#include <gf_tabutil.h>
    2222
  • factory/gengftables.cc

    rb58d47 r650f2d8  
    2323#include <factory.h>
    2424
    25 #include <assert.h>
     25#include <cf_assert.h>
    2626#include <gf_tabutil.h>
    2727
  • factory/gf_tabutil.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/gfops.cc

    rb58d47 r650f2d8  
    1313#include <string.h>
    1414
    15 #include "assert.h"
     15#include "cf_assert.h"
    1616
    1717#include "cf_defs.h"
  • factory/gfops.h

    rb58d47 r650f2d8  
    1717#endif /* NOSTREAMIO */
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include "cf_defs.h"
  • factory/imm.h

    rb58d47 r650f2d8  
    1717#endif /* NOSTREAMIO */
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include "cf_defs.h"
  • factory/initgmp.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_gmp.h"
  • factory/int_cf.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/int_cf.h

    rb58d47 r650f2d8  
    1717#endif /* NOSTREAMIO */
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include "cf_defs.h"
  • factory/int_int.h

    rb58d47 r650f2d8  
    1717#endif /* NOSTREAMIO */
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include "int_cf.h"
  • factory/int_poly.cc

    rb58d47 r650f2d8  
    1818#endif /* NOSTREAMIO */
    1919
    20 #include "assert.h"
     20#include "cf_assert.h"
    2121
    2222#include "cf_defs.h"
  • factory/int_pp.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/int_pp.h

    rb58d47 r650f2d8  
    1919#endif /* NOSTREAMIO */
    2020
    21 #include "assert.h"
     21#include "cf_assert.h"
    2222
    2323#include "int_cf.h"
  • factory/int_rat.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/int_rat.h

    rb58d47 r650f2d8  
    1717#endif /* NOSTREAMIO */
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include "canonicalform.h"
  • factory/memutil.c

    rb58d47 r650f2d8  
    88#include <stdlib.h>
    99
    10 #include "assert.h"
     10#include "cf_assert.h"
    1111
    1212#include "memutil.h"
  • factory/newdelete.cc

    rb58d47 r650f2d8  
    55#include <new>
    66
    7 #include "assert.h"
     7#include "cf_assert.h"
    88
    99#ifdef USE_OLD_MEMMAN
  • factory/parseutil.cc

    rb58d47 r650f2d8  
    77#include <stdlib.h>
    88
    9 #include "assert.h"
     9#include "cf_assert.h"
    1010
    1111#include "cf_defs.h"
  • factory/readcf.cc

    rb58d47 r650f2d8  
    103103
    104104
    105 #include "assert.h"
     105#include "cf_assert.h"
    106106
    107107#include "canonicalform.h"
  • factory/readcf.y

    rb58d47 r650f2d8  
    2525
    2626
    27 #include "assert.h"
     27#include "cf_assert.h"
    2828
    2929#include "canonicalform.h"
  • factory/singext.cc

    rb58d47 r650f2d8  
    44#include <config.h>
    55
    6 #include "assert.h"
     6#include "cf_assert.h"
    77
    88#include "cf_defs.h"
  • factory/sm_sparsemod.cc

    rb58d47 r650f2d8  
    1414#include <config.h>
    1515
    16 #include "assert.h"
     16#include "cf_assert.h"
    1717#include "debug.h"
    1818
  • factory/sm_util.cc

    rb58d47 r650f2d8  
    1414#include <config.h>
    1515
    16 #include "assert.h"
     16#include "cf_assert.h"
    1717#include "debug.h"
    1818
  • factory/var_intglobal.cc

    rb58d47 r650f2d8  
    1717#include <config.h>
    1818
    19 #include "assert.h"
     19#include "cf_assert.h"
    2020
    2121#include <string.h>
  • factory/variable.cc

    rb58d47 r650f2d8  
    66#include <string.h>
    77
    8 #include "assert.h"
     8#include "cf_assert.h"
    99
    1010#include "cf_defs.h"
  • factory/winnt/factoryconf.h

    rb58d47 r650f2d8  
    1414* way as `config.h' serves as a configuration file for the
    1515* source files from which the library is build.  Additionally,
    16 * we paste a copy of our `assert.h' into this file which is
     16* we paste a copy of our `cf_assert.h' into this file which is
    1717* necessary for the templates to translate.
    1818*
     
    102102#endif /* ! INCL_CONFIG_H */
    103103
    104 /* stuff included from ./assert.h */
     104/* stuff included from ./cf_assert.h */
    105105
    106106/* emacs edit mode for this file is -*- C -*- */
    107107/* $Id$ */
    108108
    109 /* This is for compatibility with standard assert.h */
     109/* This is for compatibility with standard cf_assert.h */
    110110#if defined (NDEBUG) && ! defined (NOASSERT)
    111111#define NOASSERT
Note: See TracChangeset for help on using the changeset viewer.