- fixed three little standard-conformance issues.

[ginac.git] / ginac / normal.cpp

diff --git a/ginac/normal.cpp b/ginac/normal.cpp
index 8ee00c8fc4cf7363cd63d1bbf953f4b62a51fc26..7a52c71d2914d331a0be314dd100a9e46dc155e6 100644 (file)
--- a/ginac/normal.cpp
+++ b/ginac/normal.cpp
@@ -207,7 +207,7 @@ static void get_symbol_stats(const ex &a, const ex &b, sym_desc_vec &v)
                it->ldeg_b = b.ldegree(*(it->sym));
                ++it;
        }
-       sort(v.begin(), v.end());
+       std::sort(v.begin(), v.end());
 #if 0
        std::clog << "Symbols:\n";
        it = v.begin(); itend = v.end();
@@ -1831,7 +1831,7 @@ ex sqrfree_parfrac(const ex & a, const symbol & x)
        // Factorize denominator and compute cofactors
        exvector yun = sqrfree_yun(denom, x);
 //clog << "yun factors: " << exprseq(yun) << endl;
-       int num_yun = yun.size();
+       unsigned num_yun = yun.size();
        exvector factor; factor.reserve(num_yun);
        exvector cofac; cofac.reserve(num_yun);
        for (unsigned i=0; i<num_yun; i++) {
@@ -1849,7 +1849,7 @@ ex sqrfree_parfrac(const ex & a, const symbol & x)
                        }
                }
        }
-       int num_factors = factor.size();
+       unsigned num_factors = factor.size();
 //clog << "factors  : " << exprseq(factor) << endl;
 //clog << "cofactors: " << exprseq(cofac) << endl;
 
@@ -1857,7 +1857,7 @@ ex sqrfree_parfrac(const ex & a, const symbol & x)
        int max_denom_deg = denom.degree(x);
        matrix sys(max_denom_deg + 1, num_factors);
        matrix rhs(max_denom_deg + 1, 1);
-       for (unsigned i=0; i<=max_denom_deg; i++) {
+       for (int i=0; i<=max_denom_deg; i++) {
                for (unsigned j=0; j<num_factors; j++)
                        sys(i, j) = cofac[j].coeff(x, i);
                rhs(i, 0) = red_numer.coeff(x, i);