Changeset 700b89d in git


Ignore:
Timestamp:
Jul 29, 2020, 5:52:53 PM (4 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
4c6bd36cc787173ccfbb33280231bd826af96053
Parents:
4a7a45801ea822129880f118ad38c3770af7226a
Message:
fix: syntax for NTL
Location:
factory
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • factory/canonicalform.cc

    r4a7a45 r700b89d  
    227227    else  if ( value->inBaseDomain() )
    228228        if ( getCharacteristic() == 0 )
     229            #ifndef HAVE_NTL
    229230            if ( value->levelcoeff() == PrimePowerDomain )
    230231            {
    … …  
    236237            }
    237238            else
     239            #endif
    238240                return *this;
     241        #ifndef HAVE_NTL
    239242        else  if ( CFFactory::gettype() == PrimePowerDomain )
    240243        {
    … …  
    251254            }
    252255        }
     256        #endif
    253257        else
    254258        {

  • factory/canonicalform.h

    r4a7a45 r700b89d  
    403403
    404404/*ENDPUBLIC*/
    405 
     405#ifndef HAVE_NTL
    406406int initCanonicalForm( void );
    407407static int cf_is_initialized_now = initCanonicalForm();
     408#endif
    408409#endif /* ! INCL_CANONICALFORM_H */

  • factory/cf_factory.cc

    r4a7a45 r700b89d  
    4747    case GaloisFieldDomain:
    4848        return int2imm_gf( gf_int2gf( value ) );
     49    #ifndef HAVE_NTL
    4950    case PrimePowerDomain:
    5051        return new InternalPrimePower( value );
     52    #endif
    5153    default: {
    5254        ASSERT( 0, "illegal basic domain!" );
Note: See TracChangeset for help on using the changeset viewer.