Changeset 5f4463 in git for Singular/ipid.cc

Timestamp:

Apr 11, 2011, 6:39:34 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

5beac5a8a177a4d4938cbc1e887bbd115a393f3a

Parents:

16733868763266ec04dae72db238bced32663735

Message:

making the sun-c/c++ compiler happy (still waiting for to issues...)



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

File:

• Singular/ipid.cc (modified) (3 diffs)

Singular/ipid.cc

@@ -76 +76 @@
 }
 
-idhdl idrec::get(const char * s, int lev)
+idhdl idrec::get(const char * s, int level)
 {
   assume(s!=NULL);
-  assume((lev>=0) && (lev<=1000)); //not really, but if it isnt in that bounds..
+  assume((level>=0) && (level<=1000)); //not really, but if it isnt in that bounds..
   idhdl h = this;
   idhdl found=NULL;
   int l;
-  const char *id;
+  const char *id_;
   int i=iiS2I(s);
   int less4=(i < (1<<24));
@@ -90 +90 @@
     omCheckAddr((ADDRESS)IDID(h));
     l=IDLEV(h);
-    if ((l==0)||(l==lev))
+    if ((l==0)||(l==level))
     {
       if (i==h->id_i)
       {
-        id=IDID(h);
-        if (less4 || (0 == strcmp(s+4,id+4)))
+        id_=IDID(h);
+        if (less4 || (0 == strcmp(s+4,id_+4)))
         {
-          if (l==lev) return h;
+          if (l==level) return h;
           found=h;
         }
@@ -183 +183 @@
   return (void *)0L;
 }
-idhdl idrec::set(const char * s, int lev, int t, BOOLEAN init)
-{
-  //printf("define %s, %x, lev: %d, typ: %d\n", s,s,lev,t);
+idhdl idrec::set(const char * s, int level, int t, BOOLEAN init)
+{
+  //printf("define %s, %x, level: %d, typ: %d\n", s,s,level,t);
   idhdl h = (idrec *)omAlloc0Bin(idrec_bin);
   IDID(h)   = s;
   IDTYP(h)  = t;
-  IDLEV(h)  = lev;
+  IDLEV(h)  = level;
   IDNEXT(h) = this;
   h->id_i=iiS2I(s);