X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac%2Finifcns_trans.cpp;h=2d15c705b990a4d7c3e32736e19cf73ef3f69327;hp=d7fa377e269395d6b6b2c0af0591f44242c1a363;hb=761d1597532504762c1f9b438c7727c4f74d7da3;hpb=ac8c33efafa1c9f62db040db0d974f47229960b8

diff --git a/ginac/inifcns_trans.cpp b/ginac/inifcns_trans.cpp
index d7fa377e..2d15c705 100644
--- a/ginac/inifcns_trans.cpp
+++ b/ginac/inifcns_trans.cpp
@@ -4,7 +4,7 @@
  *  functions. */
 
 /*
- *  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
@@ -98,7 +98,7 @@ static ex exp_expand(const ex & arg, unsigned options)
 		for (const_iterator i = exp_arg.begin(); i != exp_arg.end(); ++i)
 			prodseq.push_back(exp(*i));
 
-		return (new mul(prodseq))->setflag(status_flags::dynallocated | status_flags::expanded);
+		return dynallocate<mul>(prodseq).setflag(status_flags::expanded);
 	}
 
 	return exp(exp_arg).hold();
@@ -242,12 +242,8 @@ static ex log_series(const ex &arg,
 			// in this case n more (or less) terms are needed
 			// (sadly, to generate them, we have to start from the beginning)
 			if (n == 0 && coeff == 1) {
-				epvector epv;
-				ex acc = (new pseries(rel, epv))->setflag(status_flags::dynallocated);
-				epv.reserve(2);
-				epv.push_back(expair(-1, _ex0));
-				epv.push_back(expair(Order(_ex1), order));
-				ex rest = pseries(rel, std::move(epv)).add_series(argser);
+				ex rest = pseries(rel, epvector{expair(-1, _ex0), expair(Order(_ex1), order)}).add_series(argser);
+				ex acc = dynallocate<pseries>(rel, epvector());
 				for (int i = order-1; i>0; --i) {
 					epvector cterm { expair(i%2 ? _ex1/i : _ex_1/i, _ex0) };
 					acc = pseries(rel, std::move(cterm)).add_series(ex_to<pseries>(acc));
@@ -269,8 +265,12 @@ static ex log_series(const ex &arg,
 		const ex &point = rel.rhs();
 		const symbol foo;
 		const ex replarg = series(log(arg), s==foo, order).subs(foo==point, subs_options::no_pattern);
-		epvector seq { expair(-I*csgn(arg*I)*Pi, _ex0),
-		               expair(Order(_ex1), order) };
+		epvector seq;
+		if (order > 0) {
+			seq.reserve(2);
+			seq.push_back(expair(-I*csgn(arg*I)*Pi, _ex0));
+		}
+		seq.push_back(expair(Order(_ex1), order));
 		return series(replarg - I*Pi + pseries(rel, std::move(seq)), rel, order);
 	}
 	throw do_taylor();  // caught by function::series()
@@ -932,8 +932,12 @@ static ex atan_series(const ex &arg,
 			Order0correction += log((I*arg_pt+_ex_1)/(I*arg_pt+_ex1))*I*_ex_1_2;
 		else
 			Order0correction += log((I*arg_pt+_ex1)/(I*arg_pt+_ex_1))*I*_ex1_2;
-		epvector seq { expair(Order0correction, _ex0),
-		               expair(Order(_ex1), order) };
+		epvector seq;
+		if (order > 0) {
+			seq.reserve(2);
+			seq.push_back(expair(Order0correction, _ex0));
+		}
+		seq.push_back(expair(Order(_ex1), order));
 		return series(replarg - pseries(rel, std::move(seq)), rel, order);
 	}
 	throw do_taylor();
@@ -1538,8 +1542,12 @@ static ex atanh_series(const ex &arg,
 			Order0correction += log((arg_pt+_ex_1)/(arg_pt+_ex1))*_ex1_2;
 		else
 			Order0correction += log((arg_pt+_ex1)/(arg_pt+_ex_1))*_ex_1_2;
-		epvector seq { expair(Order0correction, _ex0),
-		               expair(Order(_ex1), order) };
+		epvector seq;
+		if (order > 0) {
+			seq.reserve(2);
+			seq.push_back(expair(Order0correction, _ex0));
+		}
+		seq.push_back(expair(Order(_ex1), order));
 		return series(replarg - pseries(rel, std::move(seq)), rel, order);
 	}
 	throw do_taylor();