Changeset 84299e in git


Ignore:
Timestamp:
Apr 9, 2013, 5:42:07 PM (9 years ago)
Author:
Martin Lee <martinlee84@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '48f1dd268d0ff74ef2f7dccbf02545425002ddcc')
Children:
55cb6bd95ed2dc1ee1fe4d8f374124dfd3836e86
Parents:
b8f8ea1509ff92e49428ea7c5713993cd700fbb6
Message:
fix: include problems when compiling without NTL but with FLINT
Location:
factory
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • factory/algext.cc

    rb8f8ea r84299e  
    864864        equal= true; // modular image did not add any new information
    865865      TIMING_START (alg_termination)
     866#ifdef HAVE_NTL
    866867#ifdef HAVE_FLINT
    867868      if (equal && tmp.isUnivariate() && f.isUnivariate() && g.isUnivariate()
     
    889890      }
    890891      else
     892#endif
    891893#endif
    892894      if(equal && fdivides( tmp, f ) && fdivides( tmp, g )) // trial division
  • factory/algext.h

    rb8f8ea r84299e  
    1 #ifndef ALGEXT_H
    2 #define ALGEXT_H
     1#ifndef CF_ALGEXT_H
     2#define CF_ALGEXT_H
    33
    44// #include "config.h"
  • factory/facMul.h

    rb8f8ea r84299e  
    1818#include "fac_util.h"
    1919
     20#ifdef HAVE_NTL
    2021/// multiplication of univariate polys over a finite field using NTL, if we are
    2122/// in GF factory's default multiplication is used.
     
    166167             );
    167168#endif
     169#endif
    168170
    169171#endif
Note: See TracChangeset for help on using the changeset viewer.