Changeset 81845eb in git


Ignore:
Timestamp:
Dec 14, 2011, 6:16:38 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')
Children:
f0168a594d5a00a74dd169a3d0189411e29989f4
Parents:
67c1dcaf5b5069c5df300f7898cff740290bf5f1
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-12-14 18:16:38+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-01-06 21:09:33+01:00
Message:
final adaptation to libfac merged into factory

FIX: no libfac_* vars + correct include: factory/libfac/factor.h
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • Singular/claptmpl.cc

    r67c1dc r81845eb  
    6464// place here your own template stuff, not instantiated by factory
    6565  // libfac:
    66 #include <libfac/factor.h>
     66#ifdef HAVE_LIBFAC
     67# include <factory/libfac/factor.h>
     68#endif
    6769
    6870// class.h:
    … …  
    135137    template class ListIterator<int>;
    136138
     139#ifdef HAVE_LIBFAC
    137140    template class List<IntList>;
    138141    template class ListIterator<IntList>;
     142#endif
    139143
    140144    template class Substitution<CanonicalForm>;

  • Singular/misc_ip.cc

    r67c1dc r81845eb  
    743743  StringAppendS("\t");
    744744#ifdef HAVE_FACTORY
    745   StringAppend("factory(%s),", factoryVersion);
     745  StringAppend("factory(%s)", factoryVersion);
    746746#ifdef HAVE_LIBFAC
    747747  // libfac:
    748   extern const char * libfac_version;
    749   extern const char * libfac_date;
    750   StringAppend("libfac(%s,%s),\n\t",libfac_version,libfac_date);
     748//  extern const char * libfac_version;
     749//  extern const char * libfac_date;
     750  StringAppend("+libfac");
    751751#endif // #ifdef HAVE_LIBFAC
     752  StringAppend(",");
    752753#endif
    753754

  • kernel/misc.cc

    r67c1dc r81845eb  
    1313/* libfac version strings */
    1414#ifdef HAVE_LIBFAC
    15   extern const char * libfac_version;
    16   extern const char * libfac_date;
     15//  extern const char * libfac_version;
     16//  extern const char * libfac_date;
    1717#endif // #ifdef HAVE_LIBFAC
    1818#endif

  • libpolys/polys/clapsing.cc

    r67c1dc r81845eb  
    1616#include <factory/factory.h>
    1717#ifdef HAVE_LIBFAC
    18 #include <libfac/factor.h>
     18#include <factory/libfac/factor.h>
    1919#endif
    2020#endif
Note: See TracChangeset for help on using the changeset viewer.