Changeset 8c9912 in git


Ignore:
Timestamp:
Apr 19, 2011, 6:50:50 PM (12 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')
Children:
e5422deba036de4a7ef8e9f6ee39173fdf1569f9
Parents:
e1761c4c3c661c1550c448e992db9c52e345ed63
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-04-19 18:50:50+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:31:20+01:00
Message:
ADD: mod_raw is needed for dynamic linkage
FIX: expose some needed symbols
FIX: use rDelete instead of rKill
Location:
libpolys
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • libpolys/coeffs/ffields.h

    re1761c r8c9912  
    5151void    nfReadTable   (const int c, const coeffs r);
    5252
    53 void    nfShowMipo();
     53void    nfShowMipo(const coeffs r);
    5454#endif
    5555

  • libpolys/polys/Makefile.am

    re1761c r8c9912  
    3434        nc/gring.cc nc/sca.cc nc/summator.cc nc/ncSAFormula.cc nc/ncSACache.cc nc/ncSAMult.cc \
    3535        pDebug.cc pInline0.cc polys0.cc prCopy.cc \
    36         kbuckets.cc sbuckets.cc ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} weight.cc \
    37         weight0.c simpleideals.cc matpol.cc
     36        kbuckets.cc sbuckets.cc weight.cc weight0.c simpleideals.cc matpol.cc \
     37  ${USE_P_PROCS_STATIC_CC} ${USE_P_PROCS_DYNAMIC_CC} templates/mod_raw.cc
    3838
    3939BUILT_SOURCES = templates/p_Procs.inc
    … …  
    4646        pInline0.h operations/pShallowCopyDelete.h \
    4747        templates/p_MemAdd.h templates/p_MemCmp.h templates/p_MemCopy.h operations/p_Mult_q.h \
    48         templates/p_Numbers.h templates/p_Procs.h \
     48        templates/p_Numbers.h templates/p_Procs.h templates/mod_raw.h \
    4949        templates/p_Procs_Dynamic.h templates/p_Procs_Impl.h templates/p_Procs_Set.h templates/p_Procs_Static.h \
    5050        monomials/p_polys.h monomials/polys-impl.h monomials/maps.h polys.h prCopy.h prCopyMacros.h \

  • libpolys/polys/monomials/ring.cc

    re1761c r8c9912  
    267267    Print("//   primitive element : %s\n", r->parameter[0]);
    268268    StringSetS("//   minpoly        : ");
    269     nfShowMipo();PrintS(StringAppendS("\n"));
     269    nfShowMipo(r->cf);PrintS(StringAppendS("\n"));
    270270  }
    271271#ifdef HAVE_RINGS

  • libpolys/polys/templates/mod_raw.cc

    re1761c r8c9912  
    1818
    1919
    20 #include <kernel/mod2.h>
    21 #include <Singular/static.h>
    22 
    23 #include <kernel/mod_raw.h>
    24 #include <kernel/febase.h>
     20#include "config.h"
     21#include <misc/auxiliary.h>
     22
     23// #include <kernel/mod2.h>
     24// #include <Singular/static.h>
     25
     26#include <reporter/reporter.h>
     27
     28#include <resources/feResource.h>
     29#include <resources/feFopen.h>
     30
     31#include "templates/mod_raw.h"
    2532
    2633#ifdef HAVE_STATIC

  • libpolys/polys/templates/p_Procs_Dynamic.cc

    re1761c r8c9912  
    3030#define LINKAGE extern "C"
    3131#define p_Procs_Kernel
    32 #include "p_Procs.inc"
    33 
    34 #include <polys/p_Procs_Dynamic.h>
     32
     33#include "templates/p_Procs.inc"
     34
     35#include "templates/p_Procs_Dynamic.h"
    3536// include general p_Proc stuff
    36 #include <polys/p_Procs_Impl.h>
    37 #include <polys/mod_raw.h>
     37#include "templates/p_Procs_Impl.h"
     38
     39#include "templates/mod_raw.h"
    3840
    3941// define to bound for length of p_Proc name

  • libpolys/resources/feFopen.cc

    re1761c r8c9912  
    1212#include <reporter/reporter.h>
    1313
    14 #include <resources/feFopen.h>
    15 #include <resources/feResource.h>
     14#include "feFopen.h"
     15#include "feResource.h"
    1616
    1717

  • libpolys/resources/feResource.cc

    re1761c r8c9912  
    153153}
    154154
     155char* feResource(const char id, int warn)
     156{
     157  return feResource(feGetResourceConfig(id), warn);
     158}
     159
    155160char* feGetResource(const char id)
    156161{
    157162  return feResource(feGetResourceConfig(id), -1);
    158 }
    159 
    160 char* feResource(const char id, int warn)
    161 {
    162   return feResource(feGetResourceConfig(id), warn);
    163163}
    164164

  • libpolys/resources/feResource.h

    re1761c r8c9912  
    66#endif
    77
     8#include <omalloc/mylimits.h>
     9
    810#define DIR_SEP '/'
    911#define DIR_SEPP "/"
     12
     13#ifndef MAXPATHLEN
     14#define MAXPATHLEN 1024
     15#endif
     16
    1017
    1118/*****************************************************************
    … …  
    2128char* feResource(const char id, int warn = -1);
    2229char* feResource(const char* key, int warn = -1);
     30
     31char* feGetResource(const char id);
     32
     33// char* feResourceDefault(const char id);
     34// char* feResourceDefault(const char* key);
     35
     36
    2337// This needs to be called before the first call to feResource
    2438// Initializes Resources, SearchPath, and extends PATH
    … …  
    2842// Prints resources into string with StringAppend, etc
    2943void feStringAppendResources(int warn = -1);
     44
    3045
    3146

  • libpolys/tests/polys_test.h

    re1761c r8c9912  
    3232#endif
    3333     
    34      rKill(r);
     34     rDelete(r);
    3535   }
    3636};
Note: See TracChangeset for help on using the changeset viewer.