Changeset 22a09d in git


Ignore:
Timestamp:
Jul 19, 2011, 1:37:08 PM (13 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
Children:
31f1262751310d366c99e1a3d2914e859f8ea5c0
Parents:
b938f43f09b016c0e34ed3e723d3d187af898b48
git-author:
Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-07-19 13:37:08+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:39:58+01:00
Message:
order of includes
Files:
18 edited
1 moved

Legend:

Unmodified
Added
Removed
  • Singular/misc_ip.cc

    rb938f4 r22a09d  
    379379
    380380/* version strings */
    381 #include <kernel/si_gmp.h>
    382381#ifdef HAVE_MPSR
    383382#include <MP_Config.h>
  • Singular/misc_ip.h

    rb938f4 r22a09d  
    2525#define MISC_H
    2626
    27 #include <kernel/si_gmp.h>
     27#include <coeffs/si_gmp.h>
    2828#include <kernel/structs.h>
    2929
  • Singular/mpsr_GetPoly.cc

    rb938f4 r22a09d  
    2020#include <Singular/mpsr_Get.h>
    2121
    22 #include <kernel/si_gmp.h>
     22#include <coeffs/si_gmp.h>
    2323#include <omalloc/omalloc.h>
    2424#include <Singular/tok.h>
  • kernel/mod2.h

    rb938f4 r22a09d  
    123123/* the maximal ascii length of an int number + 1 = 11 for 32 bit int */
    124124#define MAX_INT_LEN 11
    125 // #define MAX_INT_VAL 0x7fffffff
    126125
    127126#ifdef DO_PROFILE
  • libpolys/coeffs/ffields.h

    rb938f4 r22a09d  
    1010#include <coeffs/coeffs.h>
    1111
    12 // #define MAX_INT_VAL 0x7fffffff
    1312typedef struct
    1413{
  • libpolys/coeffs/longrat.cc

    rb938f4 r22a09d  
    66* ABSTRACT: computation with long rational numbers (Hubert Grassmann)
    77*/
     8#include "config.h"
     9#include <misc/auxiliary.h>
     10
     11#ifdef HAVE_FACTORY
     12#include <factory/factory.h>
     13#endif
    814
    915#include <coeffs/longrat.h>
     
    4551#include <float.h>
    4652
    47 #include "config.h"
    4853#include <coeffs/coeffs.h>
    4954#include <reporter/reporter.h>
     
    5459#include <coeffs/shortfl.h>
    5560#include <coeffs/mpr_complex.h>
    56 
    57 #ifdef HAVE_FACTORY
    58 #include <factory/factory.h>
    59 #endif
    6061
    6162#ifndef BYTES_PER_MP_LIMB
  • libpolys/coeffs/modulop.cc

    rb938f4 r22a09d  
    77*/
    88
     9#include "config.h"
     10#include <misc/auxiliary.h>
     11
     12#ifdef HAVE_FACTORY
     13#include <factory/factory.h>
     14#endif
     15
    916#include <string.h>
    10 #include "config.h"
    1117#include <omalloc/omalloc.h>
    1218#include <coeffs/coeffs.h>
     
    1723#include <misc/mylimits.h>
    1824#include <coeffs/modulop.h>
    19 #ifdef HAVE_FACTORY
    20 #include <factory/factory.h>
    21 #endif
    2225
    2326// int npGen=0;
  • libpolys/coeffs/numbers.cc

    rb938f4 r22a09d  
    88*/
    99
     10#include <string.h>
     11#include <stdlib.h>
     12
    1013#include "config.h"
    1114#include <misc/auxiliary.h>
     15
     16#ifdef HAVE_FACTORY
     17#include <factory/factory.h>
     18#endif
    1219
    1320
     
    3340#include <polys/ext_fields/algext.h>
    3441#endif
    35 
    36 #ifdef HAVE_FACTORY
    37 #include <factory/factory.h>
    38 #endif
    39 
    40 #include <string.h>
    41 #include <stdlib.h>
    4242
    4343
  • libpolys/polys/clapconv.cc

    rb938f4 r22a09d  
    99
    1010
     11#include "config.h"
    1112#include <misc/auxiliary.h>
    1213#ifdef HAVE_FACTORY
     14#define SI_DONT_HAVE_GLOBAL_VARS
     15#include <factory/factory.h>
     16
    1317#include <omalloc/omalloc.h>
    14 #define SI_DONT_HAVE_GLOBAL_VARS
    1518#include <coeffs/coeffs.h>
    1619#include <polys/monomials/p_polys.h>
  • libpolys/polys/clapsing.cc

    rb938f4 r22a09d  
    1212#include <misc/auxiliary.h>
    1313
     14#ifdef HAVE_FACTORY
    1415#define SI_DONT_HAVE_GLOBAL_VARS
     16#include <factory/factory.h>
     17#endif
     18
    1519#include <omalloc/omalloc.h>
    1620#include <coeffs/numbers.h>
     
    2529
    2630TODO(Martin, Please adapt the following code for the use in SW)
    27 #ifdef HAVE_FACTORY
    28 
    29 #include <factory/factory.h>
     31
    3032
    3133#include "clapsing.h"
     
    13571359}
    13581360#endif
    1359 #endif
    13601361
    13611362number   nChineseRemainder(number *x, number *q,int rl, const coeffs r)
  • libpolys/polys/clapsing.h

    rb938f4 r22a09d  
    1717#include <misc/intvec.h>
    1818#include <polys/matpol.h>
    19 #include <polys/clapconv.h>
     19//#include <polys/clapconv.h>
    2020//#include <kernel/longtrans.h>
    2121
  • libpolys/polys/monomials/p_polys.cc

    rb938f4 r22a09d  
    1010 *******************************************************************/
    1111
     12
     13
     14#include "config.h"
     15#include <misc/auxiliary.h>
     16
    1217#include <ctype.h>
    13 
    14 
    1518#include <omalloc/omalloc.h>
    16 #include <misc/auxiliary.h>
    1719#include <misc/options.h>
    1820#include <misc/intvec.h>
  • libpolys/polys/monomials/ring.cc

    rb938f4 r22a09d  
    4141// #include <???/maps.h>
    4242// #include <???/matpol.h>
    43 #ifdef HAVE_FACTORY
    44 #define SI_DONT_HAVE_GLOBAL_VARS
    45 #  include <factory/factory.h>
    46 #endif
    4743
    4844#define BITS_PER_LONG 8*SIZEOF_LONG
     
    131127    p_SetGlobals(r);
    132128    //------------ global variables related to factory -----------------
    133 #ifdef HAVE_FACTORY
    134     //int c=ABS(n_GetChar());
    135     //if (c==1) c=0;
    136     //setCharacteristic( c );
    137 #endif
    138129  }
    139130}
  • libpolys/polys/operations/p_Mult_q.cc

    rb938f4 r22a09d  
    1010 *******************************************************************/
    1111#include "config.h"
     12#include <misc/auxiliary.h>
     13
     14#ifdef HAVE_FACTORY
     15#include <factory/factory.h>
     16#endif
    1217
    1318/***************************************************************
  • libpolys/polys/simpleideals.cc

    rb938f4 r22a09d  
    17321732        }
    17331733        else
    1734           x[j]=nlInit(0, R->cf); // is R->cf really n_Q???
     1734          x[j]=n_Init(0, R->cf); // is R->cf really n_Q???, yes!
    17351735      }
    17361736       
  • libpolys/polys/templates/p_Procs_Dynamic.cc

    rb938f4 r22a09d  
    1111#include "config.h"
    1212#include <misc/auxiliary.h>
     13
     14#ifdef HAVE_FACTORY
     15#include <factory/factory.h>
     16#endif
    1317
    1418// #include <polys/structs.h>
  • libpolys/polys/templates/p_Procs_Lib.cc

    rb938f4 r22a09d  
    1818#include "config.h"
    1919#include <misc/auxiliary.h>
    20 // #include <polys/structs.h>
     20
     21#ifdef HAVE_FACTORY
     22#include <factory/factory.h>
     23#endif
     24
    2125#include <polys/monomials/p_polys.h>
    2226#include <polys/monomials/ring.h>
  • libpolys/polys/templates/p_Procs_Static.cc

    rb938f4 r22a09d  
    1010 *******************************************************************/
    1111#include "config.h"
     12#include <misc/auxiliary.h>
     13
     14#ifdef HAVE_FACTORY
     15#include <factory/factory.h>
     16#endif
     17
    1218// #include <polys/structs.h>
    1319#include <polys/monomials/ring.h>
Note: See TracChangeset for help on using the changeset viewer.