Changeset 3fd9575 in git

Timestamp:

Oct 13, 2010, 2:52:00 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

2e937c0fa46c280da4f0ba745dc31ae45d2b5ecc

Parents:

9ba138c96cf0d1db4118a21a3b6887f0fb74ae67

Message:

removed HAVE_RTIMER

git-svn-id: file:///usr/local/Singular/svn/trunk@13470 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

Singular

Files:

• gentable.cc (modified) (5 diffs)
• grammar.cc (modified) (1 diff)
• grammar.y (modified) (1 diff)
• ipassign.cc (modified) (1 diff)
• misc_ip.cc (modified) (1 diff)
• mod2.h.in (modified) (1 diff)
• subexpr.cc (modified) (4 diffs)
• table.h (modified) (1 diff)

Singular/gentable.cc

@@ -451 +451 @@
     {
       id_nr++;
-      if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_RTIMER\n");
+      if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_GETTIMEOFDAY\n");
       fprintf(outfile,"  {\"%s\", %*d, %3d, ",cmds[m].name,
                                              20-strlen(cmds[m].name),
@@ -530 +530 @@
 "  { NULL, 0, 0, 0}\n"
 "};\n"
-"#ifdef HAVE_RTIMER\n"
+"#ifdef HAVE_GETTIMEOFDAY\n"
 "#define LAST_IDENTIFIER %d\n"
 "#else\n"
@@ -576 +576 @@
   {
     if(cmds[m].tokval>0) id_nr++;
-    if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_RTIMER\n");
+    if(cmds[m].tokval==VRTIMER) fprintf(outfile,"#ifdef HAVE_GETTIMEOFDAY\n");
     fprintf(outfile,"  iiArithAddCmd(\"%s\", %*d, %3d, ",cmds[m].name,
             (int)(20-strlen(cmds[m].name)),
@@ -618 +618 @@
   fprintf(outfile, "/* end of list marker */\n");
   fprintf(outfile,
-          "#ifdef HAVE_RTIMER\n"
+          "#ifdef HAVE_GETTIMEOFDAY\n"
           "  sArithBase.nLastIdentifier = %d;\n"
-          "#else /* HAVE_RTIMER */\n"
+          "#else /* HAVE_GETTIMEOFDAY */\n"
           "  sArithBase.nLastIdentifier = %d;\n"
-          "#endif /* HAVE_RTIMER */\n",
+          "#endif /* HAVE_GETTIMEOFDAY */\n",
           id_nr,id_nr-1);
 
@@ -628 +628 @@
   fprintf(outfile,
 "}\n"
-"#ifdef HAVE_RTIMER\n"
+"#ifdef HAVE_GETTIMEOFDAY\n"
 "#define LAST_IDENTIFIER %d\n"
 "#else\n"

Singular/grammar.cc

@@ -2379 +2379 @@
               startTimer();
             }
-            #ifdef HAVE_RTIMER
+            #ifdef HAVE_GETTIMEOFDAY
             if (rtimerv)
             {

Singular/grammar.y

@@ -364 +364 @@
               startTimer();
             }
-            #ifdef HAVE_RTIMER
+            #ifdef HAVE_GETTIMEOFDAY
             if (rtimerv)
             {

Singular/ipassign.cc

@@ -65 +65 @@
   return FALSE;
 }
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
 static BOOLEAN jjRTIMER(leftv res, leftv a)
 {

Singular/misc_ip.cc

@@ -405 +405 @@
   /*t=(int)time(NULL);*/
   if (t==0) t=1;
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
   initRTimer();
 #endif

Singular/mod2.h.in

@@ -219 +219 @@
 #define HAVE_SPECTRUM 1
 
-/* Undefine to disable real time measurments  */
-#ifdef HAVE_GETTIMEOFDAY
-#define HAVE_RTIMER
-#endif
-
 #if SIZEOF_VOIDP == 8
 /* SIZEOF_LONG == SIZEOF_VOIDP is guaranteed by configure */

Singular/subexpr.cc

@@ -369 +369 @@
       case VCOLMAX:
       case VTIMER:
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
       case VRTIMER:
 #endif
@@ -401 +401 @@
       case VCOLMAX:
       case VTIMER:
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
       case VRTIMER:
 #endif
@@ -887 +887 @@
       case VCOLMAX:
       case VTIMER:
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
       case VRTIMER:
 #endif
@@ -1016 +1016 @@
       case VCOLMAX:    return (void *)colmax;
       case VTIMER:     return (void *)getTimer();
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
       case VRTIMER:    return (void *)getRTimer();
 #endif

Singular/table.h

@@ -1227 +1227 @@
 ,{D(jjCOLMAX),     VCOLMAX,        INT_CMD }
 ,{D(jjTIMER),      VTIMER,         INT_CMD }
-#ifdef HAVE_RTIMER
+#ifdef HAVE_GETTIMEOFDAY
 ,{D(jjRTIMER),     VRTIMER,        INT_CMD }
 #endif