Changeset b38f81 in git for Singular/iparith.cc

Timestamp:

Nov 7, 2013, 2:06:59 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

4a4593a9cc860e3c2819808ef08faab1b9a48009

Parents:

a97ac01c3b64767f26ac2bbccd84652d536f371ddcd92ddcba49d3aa5461148604e8d6f4e99d4625

Message:

Merge pull request #416 from steenpass/defer_shutdown_sw

chg: defer shutdown in slCleanUp() and slKill()

File:

• Singular/iparith.cc (modified) (7 diffs)

Singular/iparith.cc

@@ -7887 +7887 @@
           if (check_valid(dArith2[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(%s,%s)\n",iiTwoOps(op),Tok2Cmdname(at),Tok2Cmdname(bt));
         if ((call_failed=dArith2[i].p(res,a,b)))
@@ -7921 +7921 @@
               if (check_valid(dArith2[i].valid_for,op)) break;
             }
-            if (TEST_V_ALLWARN)
+            if (traceit&TRACE_CALL)
               Print("call %s(%s,%s)\n",iiTwoOps(op),
               Tok2Cmdname(an->rtyp),Tok2Cmdname(bn->rtyp));
@@ -8054 +8054 @@
           if (check_valid(dArith1[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(at));
         if (r<0)
@@ -8122 +8122 @@
           else
           {
-            if (TEST_V_ALLWARN)
+            if (traceit&TRACE_CALL)
               Print("call %s(%s)\n",iiTwoOps(op),Tok2Cmdname(an->rtyp));
             if (an->Next() != NULL)
@@ -8226 +8226 @@
           if (check_valid(dArith3[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(%s,%s,%s)\n",
             iiTwoOps(op),Tok2Cmdname(at),Tok2Cmdname(bt),Tok2Cmdname(ct));
@@ -8263 +8263 @@
                 if (check_valid(dArith3[i].valid_for,op)) break;
               }
-              if (TEST_V_ALLWARN)
+              if (traceit&TRACE_CALL)
                 Print("call %s(%s,%s,%s)\n",
                   iiTwoOps(op),Tok2Cmdname(an->rtyp),
@@ -8446 +8446 @@
           if (check_valid(dArithM[i].valid_for,op)) break;
         }
-        if (TEST_V_ALLWARN)
+        if (traceit&TRACE_CALL)
           Print("call %s(... (%d args))\n", iiTwoOps(op),args);
         if (dArithM[i].p(res,a))