Changeset fccc2c in git

Timestamp:

Apr 19, 2007, 2:05:39 PM (16 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

1134b5b8cb28b554f8a08701cf30c20def285743

Parents:

1d430ab97fb0bc40dcbac66c9e99a0f9c3344fec

Message:

*hannes: getid again


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

Location:

Singular

Files:

• ipid.cc (modified) (5 diffs)
• mpsr_Get.h (modified) (2 diffs)

Singular/ipid.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: ipid.cc,v 1.80 2007-04-18 16:15:58 Singular Exp $ */
+/* $Id: ipid.cc,v 1.81 2007-04-19 12:05:39 Singular Exp $ */
 
 /*
@@ -59 +59 @@
 
 #ifdef HAVE_IDI
-int iiS2I(const char *s, int &less4)
-{
-  less4=1;
+int iiS2I(const char *s)
+{
   int i;
   i=s[0];
@@ -73 +72 @@
       {
         i=(i<<8)+s[3];
-        less4=0;
       }
     }
@@ -240 +238 @@
   return found;
 #else
-  int less4;
-  int i=iiS2I(s,less4);
+  int i=iiS2I(s);
+  int less4=(i < (1<<24));
   while (h!=NULL)
   {
@@ -284 +282 @@
   IDNEXT(h) = this;
 #ifdef HAVE_IDI
-  int dummy;
-  h->id_i=iiS2I(s,dummy);
+  h->id_i=iiS2I(s);
 #endif
   if (init)

Singular/mpsr_Get.h

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Get.h,v 1.15 2007-04-18 16:15:59 Singular Exp $ */
+/* $Id: mpsr_Get.h,v 1.16 2007-04-19 12:05:39 Singular Exp $ */
 /***************************************************************
  *
@@ -112 +112 @@
   IDDATA(h) = (char *) data;
 #ifdef HAVE_IDI
-  extern int iiS2I(const char *s, int &less4);
-  int dummy;
-  h->id_i=iiS2I(name,dummy);
+  extern int iiS2I(const char *s);
+  h->id_i=iiS2I(name);
 #endif
   return h;