G_eval: fix incorrect use of STL iterator.

[ginac.git] / ginac / inifcns_nstdsums.cpp

diff --git a/ginac/inifcns_nstdsums.cpp b/ginac/inifcns_nstdsums.cpp
index 84a78c42c8e45d6c7b2ee76a9475fd42922f59d5..b4105338d329a118ba8317613a1aa5199566a592 100644 (file)
--- a/ginac/inifcns_nstdsums.cpp
+++ b/ginac/inifcns_nstdsums.cpp
@@ -47,7 +47,7 @@
  */
 
 /*
- *  GiNaC Copyright (C) 1999-2008 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2009 Johannes Gutenberg University Mainz, Germany
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -64,11 +64,6 @@
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <sstream>
-#include <stdexcept>
-#include <vector>
-#include <cln/cln.h>
-
 #include "inifcns.h"
 
 #include "add.h"
@@ -84,6 +79,10 @@
 #include "utils.h"
 #include "wildcard.h"
 
+#include <cln/cln.h>
+#include <sstream>
+#include <stdexcept>
+#include <vector>
 
 namespace GiNaC {
 
@@ -210,7 +209,7 @@ void double_Xn()
                        }
                }
                // X_n
-               for (int n=2; n<Xn.size(); ++n) {
+               for (size_t n=2; n<Xn.size(); ++n) {
                        for (int i=xninitsize+1; i<=xend; ++i) {
                                if (i & 1) {
                                        result = 0; // k == 0
@@ -570,11 +569,12 @@ ex G_eval(const Gparameter& a, int scale, const exvector& gsyms)
 
                        Gparameter newa;
                        Gparameter::const_iterator it2 = short_a.begin();
-                       for (--it2; it2 != it;) {
-                               ++it2;
+                       for (; it2 != it; ++it2) {
                                newa.push_back(*it2);
                        }
+                       newa.push_back(*it);
                        newa.push_back(a[0]);
+                       it2 = it;
                        ++it2;
                        for (; it2 != short_a.end(); ++it2) {
                                newa.push_back(*it2);   
@@ -1091,7 +1091,7 @@ G_do_trafo(const std::vector<cln::cl_N>& x, const std::vector<int>& s,
        Gparameter a(x.size());
        exmap subslst;
        std::size_t pos = 1;
-       int scale;
+       int scale = pos;
        for (sortmap_t::const_iterator it = sortmap.begin(); it != sortmap.end(); ++it) {
                if (it->second < x.size()) {
                        if (s[it->second] > 0) {
@@ -3482,7 +3482,7 @@ static void initcX(std::vector<cln::cl_N>& crX,
        int Sm = 0;
        int Smp1 = 0;
        std::vector<std::vector<cln::cl_N> > crG(s.size() - 1, std::vector<cln::cl_N>(L2 + 1));
-       for (int m=0; m < s.size() - 1; m++) {
+       for (int m=0; m < (int)s.size() - 1; m++) {
                Sm += s[m];
                Smp1 = Sm + s[m+1];
                for (int i = 0; i <= L2; i++)