From: Richard Kreckel Date: Tue, 15 Feb 2022 21:07:25 +0000 (+0100) Subject: Fix some compiler warnings. X-Git-Tag: release_1-8-3~3 X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?a=commitdiff_plain;h=1d3bdf85b4343f29a73a47481e4adc0eff0daff8;p=ginac.git Fix some compiler warnings. --- diff --git a/check/exam_matrices.cpp b/check/exam_matrices.cpp index c04e9cdf..4a93e3ae 100644 --- a/check/exam_matrices.cpp +++ b/check/exam_matrices.cpp @@ -367,7 +367,7 @@ static unsigned matrix_misc() bool caught = false; try { m5 = inverse(m4); - } catch (std::runtime_error err) { + } catch (std::runtime_error &err) { caught = true; } if (!caught) { diff --git a/doc/examples/compile1.cpp b/doc/examples/compile1.cpp index 69827251..8734cdec 100644 --- a/doc/examples/compile1.cpp +++ b/doc/examples/compile1.cpp @@ -40,7 +40,7 @@ int main() // First using compile_ex { - double result; + double result = 0.0; double point = 0.2; start = clock(); for (int i=0; i<100000; ++i) { @@ -58,7 +58,7 @@ int main() // Then without compile_ex { - ex result; + ex result = 0.0; ex point = 0.2; start = clock(); for (int i=0; i<100000; ++i) { diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp index 4fa97af9..4ca7f8d7 100644 --- a/ginac/clifford.cpp +++ b/ginac/clifford.cpp @@ -1099,7 +1099,7 @@ ex clifford_star_bar(const ex & e, bool do_bar, unsigned options) ev.reserve(e1.nops()); cv.reserve(e1.nops()); // separate clifford and non-clifford entries - for (int i= 0; i < e1.nops(); ++i) { + for (size_t i= 0; i < e1.nops(); ++i) { if (is_a(e1.op(i)) && is_a(e1.op(i).op(0))) cv.push_back(e1.op(i)); else @@ -1281,7 +1281,7 @@ static ex get_clifford_comp(const ex & e, const ex & c, bool root=true) bool found=false, same_value_found=false; ex dummy_ind=0; ev.reserve(e1.nops()); - for (int i=0; i < e1.nops();++i) { + for (size_t i=0; i < e1.nops(); ++i) { // look for a Clifford unit with the same metric and representation label, // if found remember its index if (is_a(e1.op(i)) && ex_to(e1.op(i)).get_representation_label() == rl diff --git a/ginac/normal.cpp b/ginac/normal.cpp index 3a36944c..383115f0 100644 --- a/ginac/normal.cpp +++ b/ginac/normal.cpp @@ -1957,7 +1957,6 @@ ex sqrfree_parfrac(const ex & a, const symbol & x) // Factorize denominator and compute cofactors epvector yun = sqrfree_yun(denom, x); - size_t yun_max_exponent = yun.empty() ? 0 : ex_to(yun.back().coeff).to_int(); exvector factor, cofac; for (size_t i=0; i(yun[i].coeff); @@ -2195,9 +2194,9 @@ ex basic::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const return dynallocate({replace_with_symbol(*this, repl, rev_lookup, modifier), _ex1}); normal_map_function map_normal; - int nmod = modifier.nops(); // To watch new modifiers to the replacement list + size_t nmod = modifier.nops(); // To watch new modifiers to the replacement list ex result = replace_with_symbol(map(map_normal), repl, rev_lookup, modifier); - for (int imod = nmod; imod < modifier.nops(); ++imod) { + for (size_t imod = nmod; imod < modifier.nops(); ++imod) { exmap this_repl; this_repl.insert(std::make_pair(modifier.op(imod).op(0), modifier.op(imod).op(1))); result = result.subs(this_repl, subs_options::no_pattern); @@ -2313,7 +2312,7 @@ ex add::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const exvector nums, dens; nums.reserve(seq.size()+1); dens.reserve(seq.size()+1); - int nmod = modifier.nops(); // To watch new modifiers to the replacement list + size_t nmod = modifier.nops(); // To watch new modifiers to the replacement list for (auto & it : seq) { ex n = ex_to(recombine_pair_to_ex(it)).normal(repl, rev_lookup, modifier); nums.push_back(n.op(0)); @@ -2332,7 +2331,7 @@ ex add::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const auto num_it = nums.begin(), num_itend = nums.end(); auto den_it = dens.begin(), den_itend = dens.end(); //std::clog << " num = " << *num_it << ", den = " << *den_it << std::endl; - for (int imod = nmod; imod < modifier.nops(); ++imod) { + for (size_t imod = nmod; imod < modifier.nops(); ++imod) { while (num_it != num_itend) { *num_it = num_it->subs(modifier.op(imod), subs_options::no_pattern); ++num_it; @@ -2378,7 +2377,7 @@ ex mul::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const exvector num; num.reserve(seq.size()); exvector den; den.reserve(seq.size()); ex n; - int nmod = modifier.nops(); // To watch new modifiers to the replacement list + size_t nmod = modifier.nops(); // To watch new modifiers to the replacement list for (auto & it : seq) { n = ex_to(recombine_pair_to_ex(it)).normal(repl, rev_lookup, modifier); num.push_back(n.op(0)); @@ -2388,8 +2387,8 @@ ex mul::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const num.push_back(n.op(0)); den.push_back(n.op(1)); auto num_it = num.begin(), num_itend = num.end(); - auto den_it = den.begin(), den_itend = den.end(); - for (int imod = nmod; imod < modifier.nops(); ++imod) { + auto den_it = den.begin(); + for (size_t imod = nmod; imod < modifier.nops(); ++imod) { while (num_it != num_itend) { *num_it = num_it->subs(modifier.op(imod), subs_options::no_pattern); ++num_it; @@ -2412,14 +2411,14 @@ ex mul::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const ex power::normal(exmap & repl, exmap & rev_lookup, lst & modifier) const { // Normalize basis and exponent (exponent gets reassembled) - int nmod = modifier.nops(); // To watch new modifiers to the replacement list + size_t nmod = modifier.nops(); // To watch new modifiers to the replacement list ex n_basis = ex_to(basis).normal(repl, rev_lookup, modifier); - for (int imod = nmod; imod < modifier.nops(); ++imod) + for (size_t imod = nmod; imod < modifier.nops(); ++imod) n_basis = n_basis.subs(modifier.op(imod), subs_options::no_pattern); nmod = modifier.nops(); ex n_exponent = ex_to(exponent).normal(repl, rev_lookup, modifier); - for (int imod = nmod; imod < modifier.nops(); ++imod) + for (size_t imod = nmod; imod < modifier.nops(); ++imod) n_exponent = n_exponent.subs(modifier.op(imod), subs_options::no_pattern); n_exponent = n_exponent.op(0) / n_exponent.op(1); @@ -2500,7 +2499,7 @@ ex ex::normal() const // Re-insert replaced symbols if (!repl.empty()) { - for(int i=0; i < modifier.nops(); ++i) + for(size_t i=0; i < modifier.nops(); ++i) e = e.subs(modifier.op(i), subs_options::no_pattern); e = e.subs(repl, subs_options::no_pattern); } @@ -2527,7 +2526,7 @@ ex ex::numer() const if (repl.empty()) return e.op(0); else { - for(int i=0; i < modifier.nops(); ++i) + for(size_t i=0; i < modifier.nops(); ++i) e = e.subs(modifier.op(i), subs_options::no_pattern); return e.op(0).subs(repl, subs_options::no_pattern); @@ -2552,7 +2551,7 @@ ex ex::denom() const if (repl.empty()) return e.op(1); else { - for(int i=0; i < modifier.nops(); ++i) + for(size_t i=0; i < modifier.nops(); ++i) e = e.subs(modifier.op(i), subs_options::no_pattern); return e.op(1).subs(repl, subs_options::no_pattern); @@ -2577,7 +2576,7 @@ ex ex::numer_denom() const if (repl.empty()) return e; else { - for(int i=0; i < modifier.nops(); ++i) + for(size_t i=0; i < modifier.nops(); ++i) e = e.subs(modifier.op(i), subs_options::no_pattern); return e.subs(repl, subs_options::no_pattern);