Changeset b5f5444 in git


Ignore:
Timestamp:
Aug 3, 2011, 3:47:55 PM (12 years ago)
Author:
Burcin Erocal <burcin@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
79ea4809aa81094eb116bd40570e1ef79259ab31
Parents:
e8c8d577a2c68f346822b68f71832651960d1ba0
git-author:
Burcin Erocal <burcin@erocal.org>2011-08-03 15:47:55+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:16+01:00
Message:
Fix includes in Singular/
Location:
Singular
Files:
1 added
10 edited

Legend:

Unmodified
Added
Removed

  • Singular/blackbox.h

    re8c8d5 rb5f5444  
    11#ifndef BLACKBOX_H
    22#define BLACKBOX_H
    3 #include <omalloc.h>
     3#include <omalloc/omalloc.h>
    44#include <kernel/structs.h>
    55#include <kernel/febase.h>

  • Singular/emacs.cc

    re8c8d5 rb5f5444  
    8787}
    8888
    89 #include <Singular/../kernel/feResource.cc>
     89#include <resources/feResource.cc>
    9090#include <Singular/feOpt.cc>
    9191

  • Singular/extra.cc

    re8c8d5 rb5f5444  
    5555#include <Singular/distrib.h>
    5656#include <polys/prCopy.h>
    57 #include <kernel/mpr_complex.h>
    58 #include <kernel/ffields.h>
     57#include <coeffs/mpr_complex.h>
     58#include <coeffs/ffields.h>
    5959#include <Singular/minpoly.h>
    6060
    … …  
    9494#endif
    9595
    96 #include <kernel/sca.h>
     96#include <polys/nc//sca.h>
    9797#ifdef HAVE_PLURAL
    9898#include <polys/monomials/ring.h>
    … …  
    123123#ifdef HAVE_FACTORY
    124124#define SI_DONT_HAVE_GLOBAL_VARS
    125 #include <kernel/clapconv.h>
     125#include <polys/clapconv.h>
    126126#include <kernel/kstdfac.h>
    127127#include <libfac/factor.h>

  • Singular/fehelp.cc

    re8c8d5 rb5f5444  
    2323#include <Singular/libparse.h>
    2424#include <Singular/feOpt.h>
    25 #include <kernel/dError.h>
     25#include <reporter/reporter.h>
    2626
    2727/*****************************************************************

  • Singular/iparith.cc

    re8c8d5 rb5f5444  
    2424#include <kernel/febase.h>
    2525#include <Singular/sdb.h>
    26 #include <kernel/longalg.h>
    27 #include <kernel/longtrans.h>
     26#include <polys/ext_fields/longalg.h>
     27#include <polys/ext_fields/longtrans.h>
    2828#include <kernel/ideals.h>
    2929#include <polys/prCopy.h>
    … …  
    3636#include <kernel/modulop.h>
    3737#ifdef HAVE_RINGS
    38 #include <kernel/rmodulon.h>
    39 #include <kernel/rmodulo2m.h>
    40 #include <kernel/rintegers.h>
     38#include <coeffs/rmodulon.h>
     39#include <coeffs/rmodulo2m.h>
     40#include <coeffs/rintegers.h>
    4141#endif
    4242#include <coeffs/numbers.h>
    … …  
    5050#include <Singular/attrib.h>
    5151#include <Singular/silink.h>
    52 #include <kernel/sparsmat.h>
     52#include <polys/sparsmat.h>
    5353#include <kernel/units.h>
    5454#include <Singular/janet.h>
    … …  
    7272#include <Singular/newstruct.h>
    7373#include <Singular/ipshell.h>
    74 #include <kernel/mpr_inout.h>
     74//#include <kernel/mpr_inout.h>
    7575
    7676#include <kernel/timer.h>
    … …  
    7979
    8080#ifdef HAVE_PLURAL
    81   #include <kernel/gring.h>
     81  #include <kernel/ratgring.h>
    8282  #include <kernel/sca.h>
    8383  #define ALLOW_PLURAL     1

  • Singular/ipshell.cc

    re8c8d5 rb5f5444  
    4141#include <kernel/splist.h>
    4242#include <kernel/spectrum.h>
    43 #include <kernel/gnumpfl.h>
    44 #include <kernel/mpr_base.h>
     43#include <coeffs/gnumpfl.h>
     44//#include <kernel/mpr_base.h>
    4545#include <kernel/ffields.h>
    4646#include <polys/clapsing.h>

  • Singular/libsingular.h

    re8c8d5 rb5f5444  
    1111#include <singular/febase.h>
    1212#include <singular/ring.h>
    13 #include <omalloc.h>
     13#include <omalloc/omalloc.h>
    1414#include <singular/clapsing.h>
    1515#include <singular/maps.h>

  • Singular/makefile

    re8c8d5 rb5f5444  
    353353# test: test.o
    354354
    355 test.o: test.cc mod2.h
     355test.o: test.cc mod2.h feOpt.inc
    356356        $(CXXG) ${CXXFLAGSG} ${CXXTEMPLFLAGS} ${CPPFLAGS} ${DEFSG} -c $< -o $@
     357
     358feOpt.inc: feOpt.cc mod2.h
     359        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX ${CPPFLAGS} feOpt.cc -o feOpt
     360        ./feOpt
     361        /bin/rm -f feOpt feOpt.exe
     362
     363feOptES.inc: feOpt.cc mod2.h
     364        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX  -DESINGULAR -I../kernel feOpt.cc -o feOptES
     365        ./feOptES
     366        rm -f feOptES feOptES.exe
     367
     368feOptTS.inc: feOpt.cc mod2.h
     369        $(CXX) $(CXXFLAGS) -DGENERATE_OPTION_INDEX  -DTSINGULAR -I../kernel feOpt.cc -o feOptTS
     370        ./feOptTS
     371        rm -f feOptTS feOptTS.exe
     372
     373iparith.inc: gentable.cc grammar.h tok.h table.h mod2.h
     374         ${CXX} ${CXXFLAGS} ${CPPFLAGS} ${CXXTEMPLFLAGS} ${DEFS} gentable.cc \
     375             -o gentable1
     376        ./gentable1
     377        /bin/rm -f gentable1 gentable1.exe

  • Singular/misc_ip.cc

    re8c8d5 rb5f5444  
    352352#include <misc/intvec.h>
    353353#include <polys/monomials/ring.h>
    354 #include <kernel/p_Procs.h>
     354#include <polys/templates/p_Procs.h>
    355355/* Needed for debug Version of p_SetRingOfLeftv, Oliver */
    356356#ifdef PDEBUG

  • Singular/silink.h

    re8c8d5 rb5f5444  
    1111#include <kernel/structs.h>
    1212#include <Singular/sing_dbm.h>
     13#include <Singular/lists.h>
     14#include <Singular/attrib.h>
    1315
    1416typedef struct sip_link    ip_link;
Note: See TracChangeset for help on using the changeset viewer.