From 5bf87cea66bb2071222c2910ed68c2649a98906c Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Sun, 3 Nov 2013 12:49:07 +0000 Subject: [PATCH] Keep CLang/libc++ happy. --- ginac/inifcns_nstdsums.cpp | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ginac/inifcns_nstdsums.cpp b/ginac/inifcns_nstdsums.cpp index f3e4f19e..5f5949b6 100644 --- a/ginac/inifcns_nstdsums.cpp +++ b/ginac/inifcns_nstdsums.cpp @@ -2601,7 +2601,7 @@ ex trafo_H_1tx_prepend_zero(const ex& e, const ex& arg) ex addzeta = convert_H_to_zeta(newparameter); return e.subs(h == (addzeta-H(newparameter, h.op(1)).hold())).expand(); } else { - return e * (-H(lst(0),1/arg).hold()); + return e * (-H(lst(ex(0)),1/arg).hold()); } } @@ -2632,7 +2632,7 @@ ex trafo_H_prepend_one(const ex& e, const ex& arg) newparameter.prepend(1); return e.subs(h == H(newparameter, h.op(1)).hold()); } else { - return e * H(lst(1),1-arg).hold(); + return e * H(lst(ex(1)),1-arg).hold(); } } @@ -2664,8 +2664,8 @@ ex trafo_H_1tx_prepend_minusone(const ex& e, const ex& arg) ex addzeta = convert_H_to_zeta(newparameter); return e.subs(h == (addzeta-H(newparameter, h.op(1)).hold())).expand(); } else { - ex addzeta = convert_H_to_zeta(lst(-1)); - return (e * (addzeta - H(lst(-1),1/arg).hold())).expand(); + ex addzeta = convert_H_to_zeta(lst(ex(-1))); + return (e * (addzeta - H(lst(ex(-1)),1/arg).hold())).expand(); } } @@ -2696,7 +2696,7 @@ ex trafo_H_1mxt1px_prepend_minusone(const ex& e, const ex& arg) newparameter.prepend(-1); return e.subs(h == H(newparameter, h.op(1)).hold()).expand(); } else { - return (e * H(lst(-1),(1-arg)/(1+arg)).hold()).expand(); + return (e * H(lst(ex(-1)),(1-arg)/(1+arg)).hold()).expand(); } } @@ -2727,7 +2727,7 @@ ex trafo_H_1mxt1px_prepend_one(const ex& e, const ex& arg) newparameter.prepend(1); return e.subs(h == H(newparameter, h.op(1)).hold()).expand(); } else { - return (e * H(lst(1),(1-arg)/(1+arg)).hold()).expand(); + return (e * H(lst(ex(1)),(1-arg)/(1+arg)).hold()).expand(); } } @@ -2806,7 +2806,7 @@ struct map_trafo_H_1mx : public map_function // leading one map_trafo_H_1mx recursion; map_trafo_H_mult unify; - ex res = H(lst(1), arg).hold() * H(newparameter, arg).hold(); + ex res = H(lst(ex(1)), arg).hold() * H(newparameter, arg).hold(); std::size_t firstzero = 0; while (parameter.op(firstzero) == 1) { firstzero++; @@ -2870,7 +2870,7 @@ struct map_trafo_H_1overx : public map_function } if (allthesame) { map_trafo_H_mult unify; - return unify((pow(H(lst(-1),1/arg).hold() - H(lst(0),1/arg).hold(), parameter.nops()) + return unify((pow(H(lst(ex(-1)),1/arg).hold() - H(lst(ex(0)),1/arg).hold(), parameter.nops()) / factorial(parameter.nops())).expand()); } } else { @@ -2882,7 +2882,7 @@ struct map_trafo_H_1overx : public map_function } if (allthesame) { map_trafo_H_mult unify; - return unify((pow(H(lst(1),1/arg).hold() + H(lst(0),1/arg).hold() + H_polesign, parameter.nops()) + return unify((pow(H(lst(ex(1)),1/arg).hold() + H(lst(ex(0)),1/arg).hold() + H_polesign, parameter.nops()) / factorial(parameter.nops())).expand()); } } @@ -2925,7 +2925,7 @@ struct map_trafo_H_1overx : public map_function // leading one map_trafo_H_1overx recursion; map_trafo_H_mult unify; - ex res = H(lst(1), arg).hold() * H(newparameter, arg).hold(); + ex res = H(lst(ex(1)), arg).hold() * H(newparameter, arg).hold(); std::size_t firstzero = 0; while (parameter.op(firstzero) == 1) { firstzero++; @@ -2981,7 +2981,7 @@ struct map_trafo_H_1mxt1px : public map_function } if (allthesame) { map_trafo_H_mult unify; - return unify((pow(-H(lst(1),(1-arg)/(1+arg)).hold() - H(lst(-1),(1-arg)/(1+arg)).hold(), parameter.nops()) + return unify((pow(-H(lst(ex(1)),(1-arg)/(1+arg)).hold() - H(lst(ex(-1)),(1-arg)/(1+arg)).hold(), parameter.nops()) / factorial(parameter.nops())).expand()); } } else if (parameter.op(0) == -1) { @@ -2993,7 +2993,7 @@ struct map_trafo_H_1mxt1px : public map_function } if (allthesame) { map_trafo_H_mult unify; - return unify((pow(log(2) - H(lst(-1),(1-arg)/(1+arg)).hold(), parameter.nops()) + return unify((pow(log(2) - H(lst(ex(-1)),(1-arg)/(1+arg)).hold(), parameter.nops()) / factorial(parameter.nops())).expand()); } } else { @@ -3005,7 +3005,7 @@ struct map_trafo_H_1mxt1px : public map_function } if (allthesame) { map_trafo_H_mult unify; - return unify((pow(-log(2) - H(lst(0),(1-arg)/(1+arg)).hold() + H(lst(-1),(1-arg)/(1+arg)).hold(), parameter.nops()) + return unify((pow(-log(2) - H(lst(ex(0)),(1-arg)/(1+arg)).hold() + H(lst(ex(-1)),(1-arg)/(1+arg)).hold(), parameter.nops()) / factorial(parameter.nops())).expand()); } } @@ -3048,7 +3048,7 @@ struct map_trafo_H_1mxt1px : public map_function // leading one map_trafo_H_1mxt1px recursion; map_trafo_H_mult unify; - ex res = H(lst(1), arg).hold() * H(newparameter, arg).hold(); + ex res = H(lst(ex(1)), arg).hold() * H(newparameter, arg).hold(); std::size_t firstzero = 0; while (parameter.op(firstzero) == 1) { firstzero++; -- 2.44.0