Commit e30f2897 authored by Kevin Modzelewski's avatar Kevin Modzelewski

Fix merge issue between #804 and #811

parent 2f5d72db
...@@ -4472,13 +4472,13 @@ extern "C" Box* unaryop(Box* operand, int op_type) { ...@@ -4472,13 +4472,13 @@ extern "C" Box* unaryop(Box* operand, int op_type) {
Box* rtn = NULL; Box* rtn = NULL;
if (rewriter) { if (rewriter) {
CallRewriteArgs srewrite_args(rewriter.get(), rewriter->getArg(0), rewriter->getReturnDestination()); CallRewriteArgs srewrite_args(rewriter.get(), rewriter->getArg(0), rewriter->getReturnDestination());
rtn = callattrInternal0(operand, op_name, CLASS_ONLY, &srewrite_args, ArgPassSpec(0)); rtn = callattrInternal0<CXX>(operand, op_name, CLASS_ONLY, &srewrite_args, ArgPassSpec(0));
if (srewrite_args.out_success && rtn) if (srewrite_args.out_success && rtn)
rewriter->commitReturning(srewrite_args.out_rtn); rewriter->commitReturning(srewrite_args.out_rtn);
else else
rewriter.reset(); rewriter.reset();
} else } else
rtn = callattrInternal0(operand, op_name, CLASS_ONLY, NULL, ArgPassSpec(0)); rtn = callattrInternal0<CXX>(operand, op_name, CLASS_ONLY, NULL, ArgPassSpec(0));
if (rtn == NULL) { if (rtn == NULL) {
raiseExcHelper(TypeError, "bad operand type for unary '%s': '%s'", op_name->c_str(), getTypeName(operand)); raiseExcHelper(TypeError, "bad operand type for unary '%s': '%s'", op_name->c_str(), getTypeName(operand));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment