Add some minor optimizations.

[ginac.git] / ginac / color.cpp

diff --git a/ginac/color.cpp b/ginac/color.cpp
index a91775cdf5cbefaa4ee84987eb9f915f7a318ff9..1d006e495dc3421df2913e39cfc9d705ec4ddfd1 100644 (file)
--- a/ginac/color.cpp
+++ b/ginac/color.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's color (SU(3) Lie algebra) objects. */
 
 /*
- *  GiNaC Copyright (C) 1999-2014 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2015 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
@@ -90,7 +90,7 @@ color::color(unsigned char rl, const exvector & v, bool discardable) : inherited
 {
 }
 
-color::color(unsigned char rl, std::auto_ptr<exvector> vp) : inherited(not_symmetric(), vp), representation_label(rl)
+color::color(unsigned char rl, exvector && v) : inherited(not_symmetric(), std::move(v)), representation_label(rl)
 {
 }
 
@@ -166,11 +166,9 @@ ex color::eval_ncmul(const exvector & v) const
        s.reserve(v.size());
 
        // Remove superfluous ONEs
-       exvector::const_iterator it = v.begin(), itend = v.end();
-       while (it != itend) {
-               if (!is_a<su3one>(it->op(0)))
-                       s.push_back(*it);
-               it++;
+       for (auto & it : v) {
+               if (!is_a<su3one>(it.op(0)))
+                       s.push_back(it);
        }
 
        if (s.empty())
@@ -184,9 +182,9 @@ ex color::thiscontainer(const exvector & v) const
        return color(representation_label, v);
 }
 
-ex color::thiscontainer(std::auto_ptr<exvector> vp) const
+ex color::thiscontainer(exvector && v) const
 {
-       return color(representation_label, vp);
+       return color(representation_label, std::move(v));
 }
 
 /** Given a vector iv3 of three indices and a vector iv2 of two indices that
@@ -195,7 +193,7 @@ ex color::thiscontainer(std::auto_ptr<exvector> vp) const
  *
  *  @param iv3 Vector of 3 indices
  *  @param iv2 Vector of 2 indices, must be a subset of iv3
- *  @param sig Returs sign introduced by index permutation
+ *  @param sig Returns sign introduced by index permutation
  *  @return the free index (the one that is in iv3 but not in iv2) */
 static ex permute_free_index_to_front(const exvector & iv3, const exvector & iv2, int & sig)
 {
@@ -314,7 +312,7 @@ bool su3t::contract_with(exvector::iterator self, exvector::iterator other, exve
 
        if (is_exactly_a<su3t>(other->op(0))) {
 
-               // Contraction only makes sense if the represenation labels are equal
+               // Contraction only makes sense if the representation labels are equal
                GINAC_ASSERT(is_a<color>(*other));
                if (ex_to<color>(*other).get_representation_label() != rl)
                        return false;
@@ -625,9 +623,9 @@ ex color_trace(const ex & e, const lst & rll)
 {
        // Convert list to set
        std::set<unsigned char> rls;
-       for (lst::const_iterator i = rll.begin(); i != rll.end(); ++i) {
-               if (i->info(info_flags::nonnegint))
-                       rls.insert(ex_to<numeric>(*i).to_int());
+       for (auto & it : rll) {
+               if (it.info(info_flags::nonnegint))
+                       rls.insert(ex_to<numeric>(it).to_int());
        }
 
        return color_trace(e, rls);