X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=blobdiff_plain;f=ginac%2Ffactor.cpp;h=e96dccfa81eded8468a390f455d0b2f9f54462da;hb=65f2693a0948d1db0bc68d7656c64e1fed91c158;hp=8f8c87e858340e625df38a3bffe1fb3cfc0356fa;hpb=852fb174c43b49a3ce1b568f959d23e8a1959ee1;p=ginac.git diff --git a/ginac/factor.cpp b/ginac/factor.cpp index 8f8c87e8..e96dccfa 100644 --- a/ginac/factor.cpp +++ b/ginac/factor.cpp @@ -70,6 +70,7 @@ #include #include #include +#include #ifdef DEBUGFACTOR #include #endif @@ -1830,7 +1831,7 @@ static upvec univar_diophant(const upvec& a, const ex& x, unsigned int m, unsign struct make_modular_map : public map_function { cl_modint_ring R; make_modular_map(const cl_modint_ring& R_) : R(R_) { } - ex operator()(const ex& e) + ex operator()(const ex& e) override { if ( is_a(e) || is_a(e) ) { return e.map(*this); @@ -2092,7 +2093,7 @@ static ex hensel_multivar(const ex& a, const ex& x, const vector& I, } else { lst res; - return lst(); + return lst{}; } } @@ -2266,7 +2267,7 @@ static ex factor_multivariate(const ex& poly, const exset& syms) ex vn = pp.collect(x).lcoeff(x); ex vnlst; if ( is_a(vn) ) { - vnlst = lst(vn); + vnlst = lst{vn}; } else { ex vnfactors = factor(vn); @@ -2440,7 +2441,7 @@ static ex factor_multivariate(const ex& poly, const exset& syms) // try Hensel lifting ex res = hensel_multivar(pp, x, epv, prime, l, modfactors, C); - if ( res != lst() ) { + if ( res != lst{} ) { ex result = cont * unit; for ( size_t i=0; i(e) ) { syms.insert(e); @@ -2503,7 +2504,7 @@ static ex factor_sqrfree(const ex& poly) struct apply_factor_map : public map_function { unsigned options; apply_factor_map(unsigned options_) : options(options_) { } - ex operator()(const ex& e) + ex operator()(const ex& e) override { if ( e.info(info_flags::polynomial) ) { return factor(e, options);