Happy New Year!

[ginac.git] / ginac / polynomial / collect_vargs.cpp

diff --git a/ginac/polynomial/collect_vargs.cpp b/ginac/polynomial/collect_vargs.cpp
index acae53e6abdf2f65b18eae4b7c0a5bbd04c539ed..6beda76fc574a0c8f375dce15efc1bb620f80940 100644 (file)
--- a/ginac/polynomial/collect_vargs.cpp
+++ b/ginac/polynomial/collect_vargs.cpp
@@ -3,7 +3,7 @@
  *  Utility functions. */
 
 /*
  *  Utility functions. */
 
 /*

- *  GiNaC Copyright (C) 1999-2010 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2019 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
  *
  *  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


@@ -118,7 +118,7 @@ collect_term(ex_collect_priv_t& ec, const ex& e, const exvector& vars)
                key[i] = var_i_pow;
                pre_coeff = pre_coeff.coeff(vars[i], var_i_pow);
        }
                key[i] = var_i_pow;
                pre_coeff = pre_coeff.coeff(vars[i], var_i_pow);
        }

-       ex_collect_priv_t::iterator i = ec.find(key);
+       auto i = ec.find(key);

        if (i != ec.end())
                i->second += pre_coeff;
        else
        if (i != ec.end())
                i->second += pre_coeff;
        else


@@ -127,9 +127,9 @@ collect_term(ex_collect_priv_t& ec, const ex& e, const exvector& vars)
 
 static void wipe_out_zeros(ex_collect_priv_t& m)
 {
 
 static void wipe_out_zeros(ex_collect_priv_t& m)
 {

-       ex_collect_priv_t::iterator i = m.begin();
+       auto i = m.begin();

        while (i != m.end()) {
        while (i != m.end()) {

-               // be careful to not invalide iterator, use post-increment
+               // be careful to not invalidate the iterator, use post-increment

                // for that, see e.g.
                // http://coding.derkeiler.com/Archive/C_CPP/comp.lang.cpp/2004-02/0502.html
                if (i->second.is_zero())
                // for that, see e.g.
                // http://coding.derkeiler.com/Archive/C_CPP/comp.lang.cpp/2004-02/0502.html
                if (i->second.is_zero())


@@ -139,8 +139,8 @@ static void wipe_out_zeros(ex_collect_priv_t& m)
        }
 }
 
        }
 }
 

-GiNaC::ex
-ex_collect_to_ex(const ex_collect_t& ec, const GiNaC::exvector& vars)
+ex
+ex_collect_to_ex(const ex_collect_t& ec, const exvector& vars)

 {
        exvector ev;
        ev.reserve(ec.size());
 {
        exvector ev;
        ev.reserve(ec.size());


@@ -155,13 +155,13 @@ ex_collect_to_ex(const ex_collect_t& ec, const GiNaC::exvector& vars)
                                "expression has " << exp_vector.size() << " instead");
 
                        if (exp_vector[j] != 0)
                                "expression has " << exp_vector.size() << " instead");
 
                        if (exp_vector[j] != 0)

-                               tv.push_back(power(vars[j], exp_vector[j]));
+                               tv.push_back(pow(vars[j], exp_vector[j]));

                }
                tv.push_back(ec[i].second);
                }
                tv.push_back(ec[i].second);

-               ex tmp = (new mul(tv))->setflag(status_flags::dynallocated);
+               ex tmp = dynallocate<mul>(tv);

                ev.push_back(tmp);
        }
                ev.push_back(tmp);
        }

-       ex ret = (new add(ev))->setflag(status_flags::dynallocated);
+       ex ret = dynallocate<add>(ev);

        return ret;
 }
 
        return ret;
 }