[PATCH] Fix bug in evaluation of real and imaginary parts of powers.

[ginac.git] / ginac / symmetry.cpp

diff --git a/ginac/symmetry.cpp b/ginac/symmetry.cpp
index 146700397ec83d2b2f6738ea0d29abb909694327..28e6b27ba54faf7328e78c14c9e8cceb42413660 100644 (file)
--- a/ginac/symmetry.cpp
+++ b/ginac/symmetry.cpp
@@ -3,7 +3,7 @@
  *  Implementation of GiNaC's symmetry definitions. */
 
 /*
- *  GiNaC Copyright (C) 1999-2015 Johannes Gutenberg University Mainz, Germany
+ *  GiNaC Copyright (C) 1999-2017 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
@@ -325,71 +325,71 @@ void symmetry::validate(unsigned n)
 
 static const symmetry & index0()
 {
-       static ex s = (new symmetry(0))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(0);
        return ex_to<symmetry>(s);
 }
 
 static const symmetry & index1()
 {
-       static ex s = (new symmetry(1))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(1);
        return ex_to<symmetry>(s);
 }
 
 static const symmetry & index2()
 {
-       static ex s = (new symmetry(2))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(2);
        return ex_to<symmetry>(s);
 }
 
 static const symmetry & index3()
 {
-       static ex s = (new symmetry(3))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(3);
        return ex_to<symmetry>(s);
 }
 
 const symmetry & not_symmetric()
 {
-       static ex s = (new symmetry)->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>();
        return ex_to<symmetry>(s);
 }
 
 const symmetry & symmetric2()
 {
-       static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & symmetric3()
 {
-       static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1()).add(index2());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & symmetric4()
 {
-       static ex s = (new symmetry(symmetry::symmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::symmetric, index0(), index1()).add(index2()).add(index3());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & antisymmetric2()
 {
-       static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & antisymmetric3()
 {
-       static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1()).add(index2());
        return ex_to<symmetry>(s);
 }
 
 const symmetry & antisymmetric4()
 {
-       static ex s = (new symmetry(symmetry::antisymmetric, index0(), index1()))->add(index2()).add(index3()).setflag(status_flags::dynallocated);
+       static ex s = dynallocate<symmetry>(symmetry::antisymmetric, index0(), index1()).add(index2()).add(index3());
        return ex_to<symmetry>(s);
 }
 
-class sy_is_less : public std::binary_function<ex, ex, bool> {
+class sy_is_less {
        exvector::iterator v;
 
 public:
@@ -413,7 +413,7 @@ public:
        }
 };
 
-class sy_swap : public std::binary_function<ex, ex, void> {
+class sy_swap {
        exvector::iterator v;
 
 public:
@@ -513,7 +513,7 @@ static ex symm(const ex & e, exvector::const_iterator first, exvector::const_ite
                }
                sum_v.push_back(term);
        }
-       ex sum = (new add(sum_v))->setflag(status_flags::dynallocated);
+       ex sum = dynallocate<add>(sum_v);
 
        delete[] iv;
        delete[] iv2;