From cb7ccb528bbaeb30d09fbb41e57ab75d3121e1bc Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 3 Nov 2004 18:12:03 +0000 Subject: * string2ATerm -> overloaded toATerm. --- src/libexpr/eval.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libexpr/eval.cc') diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc index cef346002962..d4593b5c0ec0 100644 --- a/src/libexpr/eval.cc +++ b/src/libexpr/eval.cc @@ -328,11 +328,11 @@ Expr evalExpr2(EvalState & state, Expr e) e2 = evalExpr(state, e2); ATerm s1, s2; if (matchStr(e1, s1) && matchStr(e2, s2)) - return makeStr(string2ATerm(( - (string) aterm2String(s1) + (string) aterm2String(s2)).c_str())); + return makeStr(toATerm( + (string) aterm2String(s1) + (string) aterm2String(s2))); else if (matchPath(e1, s1) && matchPath(e2, s2)) - return makePath(string2ATerm(canonPath( - (string) aterm2String(s1) + "/" + (string) aterm2String(s2)).c_str())); + return makePath(toATerm(canonPath( + (string) aterm2String(s1) + "/" + (string) aterm2String(s2)))); else throw Error("wrong argument types in `+' operator"); } -- cgit 1.4.1