Happy New Year!

[ginac.git] / ginac / parser / parse_binop_rhs.cpp

diff --git a/ginac/parser/parse_binop_rhs.cpp b/ginac/parser/parse_binop_rhs.cpp
index a0ca4cd353dab381ebc977de2bd7c5a28b58d3e9..00e7ffd0919b32f5227a5b24cd19faffa315dc95 100644 (file)
--- a/ginac/parser/parse_binop_rhs.cpp
+++ b/ginac/parser/parse_binop_rhs.cpp
@@ -3,7 +3,7 @@
  *  Code to deal with binary operators. */
 
 /*
- *  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
@@ -121,9 +121,9 @@ static ex make_minus_expr(const exvector& args)
        exvector rest_args;
        rest_args.reserve(args.size() - 1);
        std::copy(args.begin() + 1, args.end(), std::back_inserter(rest_args));
-       ex rest_base = (new add(rest_args))->setflag(status_flags::dynallocated);
-       ex rest = (new mul(rest_base, *_num_1_p))->setflag(status_flags::dynallocated);
-       ex ret = (new add(args[0], rest))->setflag(status_flags::dynallocated);
+       ex rest_base = dynallocate<add>(rest_args);
+       ex rest = dynallocate<mul>(rest_base, *_num_1_p);
+       ex ret = dynallocate<add>(args[0], rest);
        return ret;
 }
 
@@ -132,20 +132,20 @@ static ex make_divide_expr(const exvector& args)
        exvector rest_args;
        rest_args.reserve(args.size() - 1);
        std::copy(args.begin() + 1, args.end(), std::back_inserter(rest_args));
-       ex rest_base = (new mul(rest_args))->setflag(status_flags::dynallocated);
+       ex rest_base = dynallocate<mul>(rest_args);
        ex rest = pow(rest_base, *_num_1_p);
-       return (new mul(args[0], rest))->setflag(status_flags::dynallocated);
+       return dynallocate<mul>(args[0], rest);
 }
 
 static ex make_binop_expr(const int binop, const exvector& args)
 {
        switch (binop) {
                case '+':
-                       return (new add(args))->setflag(status_flags::dynallocated);
+                       return dynallocate<add>(args);
                case '-':
                        return make_minus_expr(args);
                case '*':
-                       return (new mul(args))->setflag(status_flags::dynallocated);
+                       return dynallocate<mul>(args);
                case '/':
                        return make_divide_expr(args);
                case '^':