From 4f18eb00180c256681072f10d9e2e08dbf84ff0b Mon Sep 17 00:00:00 2001
From: Christian Bauer <Christian.Bauer@uni-mainz.de>
Date: Mon, 25 Jun 2001 22:32:26 +0000
Subject: [PATCH] fixed some -Wall stuff

---
 ginac/clifford.cpp    | 15 +++++++--------
 ginac/color.cpp       |  2 +-
 ginac/indexed.cpp     |  8 ++++----
 ginac/input_lexer.ll  |  2 +-
 ginac/matrix.cpp      |  2 --
 ginac/normal.cpp      |  6 +++---
 ginac/symmetry.cpp    |  5 ++---
 ginac/tensor.cpp      |  6 +++---
 ginsh/ginsh_parser.yy |  1 +
 9 files changed, 22 insertions(+), 25 deletions(-)

diff --git a/ginac/clifford.cpp b/ginac/clifford.cpp
index 80d7d342..cde94ebd 100644
--- a/ginac/clifford.cpp
+++ b/ginac/clifford.cpp
@@ -378,8 +378,8 @@ static ex trace_string(exvector::const_iterator ix, unsigned num)
 	exvector v(num - 2);
 	int sign = 1;
 	ex result;
-	for (int i=1; i<num; i++) {
-		for (int n=1, j=0; n<num; n++) {
+	for (unsigned i=1; i<num; i++) {
+		for (unsigned n=1, j=0; n<num; n++) {
 			if (n == i)
 				continue;
 			v[j++] = ix[n];
@@ -406,7 +406,6 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
 		ex prod = _ex1();
 		for (unsigned i=0; i<e.nops(); i++) {
 			const ex &o = e.op(i);
-			unsigned ti = o.return_type_tinfo();
 			if (is_clifford_tinfo(o.return_type_tinfo(), rl))
 				prod *= dirac_trace(o, rl, trONE);
 			else
@@ -448,18 +447,18 @@ ex dirac_trace(const ex & e, unsigned char rl, const ex & trONE)
 			num--;
 			int *iv = new int[num];
 			ex result;
-			for (int i=0; i<num-3; i++) {
+			for (unsigned i=0; i<num-3; i++) {
 				ex idx1 = ix[i];
-				for (int j=i+1; j<num-2; j++) {
+				for (unsigned j=i+1; j<num-2; j++) {
 					ex idx2 = ix[j];
-					for (int k=j+1; k<num-1; k++) {
+					for (unsigned k=j+1; k<num-1; k++) {
 						ex idx3 = ix[k];
-						for (int l=k+1; l<num; l++) {
+						for (unsigned l=k+1; l<num; l++) {
 							ex idx4 = ix[l];
 							iv[0] = i; iv[1] = j; iv[2] = k; iv[3] = l;
 							exvector v;
 							v.reserve(num - 4);
-							for (int n=0, t=4; n<num; n++) {
+							for (unsigned n=0, t=4; n<num; n++) {
 								if (n == i || n == j || n == k || n == l)
 									continue;
 								iv[t++] = n;
diff --git a/ginac/color.cpp b/ginac/color.cpp
index 57364b5c..3b544171 100644
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -573,7 +573,7 @@ ex color_trace(const ex & e, unsigned char rl)
 
 			exvector v1;
 			v1.reserve(num - 2);
-			for (int i=0; i<num-2; i++)
+			for (unsigned i=0; i<num-2; i++)
 				v1.push_back(e.op(i));
 
 			exvector v2 = v1;
diff --git a/ginac/indexed.cpp b/ginac/indexed.cpp
index 736c109b..a603ca22 100644
--- a/ginac/indexed.cpp
+++ b/ginac/indexed.cpp
@@ -535,8 +535,8 @@ exvector power::get_free_indices(void) const
  *    by the function */
 static ex rename_dummy_indices(const ex & e, exvector & global_dummy_indices, exvector & local_dummy_indices)
 {
-	int global_size = global_dummy_indices.size(),
-	    local_size = local_dummy_indices.size();
+	unsigned global_size = global_dummy_indices.size(),
+	         local_size = local_dummy_indices.size();
 
 	// Any local dummy indices at all?
 	if (local_size == 0)
@@ -596,7 +596,7 @@ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & du
 		v.push_back(e.op(0));
 		v.push_back(e.op(0));
 	} else {
-		for (int i=0; i<e.nops(); i++) {
+		for (unsigned i=0; i<e.nops(); i++) {
 			ex f = e.op(i);
 			if (is_ex_exactly_of_type(f, power) && f.op(1).is_equal(_ex2())) {
 				v.push_back(f.op(0));
@@ -604,7 +604,7 @@ ex simplify_indexed_product(const ex & e, exvector & free_indices, exvector & du
 			} else if (is_ex_exactly_of_type(f, ncmul)) {
 				// Noncommutative factor found, split it as well
 				non_commutative = true; // everything becomes noncommutative, ncmul will sort out the commutative factors later
-				for (int j=0; j<f.nops(); j++)
+				for (unsigned j=0; j<f.nops(); j++)
 					v.push_back(f.op(j));
 			} else
 				v.push_back(f);
diff --git a/ginac/input_lexer.ll b/ginac/input_lexer.ll
index 46df9595..f39de456 100644
--- a/ginac/input_lexer.ll
+++ b/ginac/input_lexer.ll
@@ -171,7 +171,7 @@ void set_lexer_symbols(ex l)
 	syms.clear();
 	if (!is_ex_exactly_of_type(l, lst))
 		return;
-	for (int i=0; i<l.nops(); i++) {
+	for (unsigned i=0; i<l.nops(); i++) {
 		if (is_ex_exactly_of_type(l.op(i), symbol))
 			syms[ex_to_symbol(l.op(i)).get_name()] = sym_def(l.op(i), true);
 	}
diff --git a/ginac/matrix.cpp b/ginac/matrix.cpp
index 91382c2f..1f5e9af5 100644
--- a/ginac/matrix.cpp
+++ b/ginac/matrix.cpp
@@ -415,10 +415,8 @@ bool matrix::contract_with(exvector::iterator self, exvector::iterator other, ex
 	const matrix &other_matrix = ex_to<matrix>(other->op(0));
 
 	if (self->nops() == 2) {
-		unsigned self_dim = (self_matrix.col == 1) ? self_matrix.row : self_matrix.col;
 
 		if (other->nops() == 2) { // vector * vector (scalar product)
-			unsigned other_dim = (other_matrix.col == 1) ? other_matrix.row : other_matrix.col;
 
 			if (self_matrix.col == 1) {
 				if (other_matrix.col == 1) {
diff --git a/ginac/normal.cpp b/ginac/normal.cpp
index 8ee00c8f..379d1230 100644
--- a/ginac/normal.cpp
+++ b/ginac/normal.cpp
@@ -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);
diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 7d56f6ab..dc2546ff 100644
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -141,7 +141,6 @@ DEFAULT_UNARCHIVE(symmetry)
 int symmetry::compare_same_type(const basic & other) const
 {
 	GINAC_ASSERT(is_of_type(other, symmetry));
-	const symmetry &o = static_cast<const symmetry &>(other);
 
 	// All symmetry trees are equal. They are not supposed to appear in
 	// ordinary expressions anyway...
@@ -309,7 +308,7 @@ int canonicalize(exvector::iterator v, const symmetry &symm)
 static ex symm(const ex & e, exvector::const_iterator first, exvector::const_iterator last, bool asymmetric)
 {
 	// Need at least 2 objects for this operation
-	int num = last - first;
+	unsigned num = last - first;
 	if (num < 2)
 		return e;
 
@@ -358,7 +357,7 @@ ex antisymmetrize(const ex & e, exvector::const_iterator first, exvector::const_
 ex symmetrize_cyclic(const ex & e, exvector::const_iterator first, exvector::const_iterator last)
 {
 	// Need at least 2 objects for this operation
-	int num = last - first;
+	unsigned num = last - first;
 	if (num < 2)
 		return e;
 
diff --git a/ginac/tensor.cpp b/ginac/tensor.cpp
index 00d0cdff..1c8847a4 100644
--- a/ginac/tensor.cpp
+++ b/ginac/tensor.cpp
@@ -344,7 +344,7 @@ bool tensdelta::contract_with(exvector::iterator self, exvector::iterator other,
 
 again:
 	if (self_idx->is_symbolic()) {
-		for (int i=1; i<other->nops(); i++) {
+		for (unsigned i=1; i<other->nops(); i++) {
 			const idx &other_idx = ex_to<idx>(other->op(i));
 			if (is_dummy_pair(*self_idx, other_idx)) {
 
@@ -389,7 +389,7 @@ bool tensmetric::contract_with(exvector::iterator self, exvector::iterator other
 
 again:
 	if (self_idx->is_symbolic()) {
-		for (int i=1; i<other->nops(); i++) {
+		for (unsigned i=1; i<other->nops(); i++) {
 			const idx &other_idx = ex_to<idx>(other->op(i));
 			if (is_dummy_pair(*self_idx, other_idx)) {
 
@@ -467,7 +467,7 @@ bool spinmetric::contract_with(exvector::iterator self, exvector::iterator other
 
 again:
 	if (self_idx->is_symbolic()) {
-		for (int i=1; i<other->nops(); i++) {
+		for (unsigned i=1; i<other->nops(); i++) {
 			const idx &other_idx = ex_to<idx>(other->op(i));
 			if (is_dummy_pair(*self_idx, other_idx)) {
 
diff --git a/ginsh/ginsh_parser.yy b/ginsh/ginsh_parser.yy
index 16601cee..bca29dd5 100644
--- a/ginsh/ginsh_parser.yy
+++ b/ginsh/ginsh_parser.yy
@@ -398,6 +398,7 @@ class apply_map_function : public map_function {
 	ex apply;
 public:
 	apply_map_function(const ex & a) : apply(a) {}
+	virtual ~apply_map_function() {}
 	ex operator()(const ex & e) { return apply.subs(wild() == e, true); }
 };
 
-- 
2.44.0