Changeset 2ac2935 in git for Singular/ipid.cc

Timestamp:

Dec 7, 2012, 3:41:00 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ec1006cbd9971c4271d05aefada775ef29d762a6

Parents:

7e18d198148353f88708cfa20f738ac338cb1f556554ca42ebe1277c9afe7990970390905a6e1cf0

Message:

Merge conflict resolved

File:

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

Singular/ipid.cc

@@ -194 +194 @@
   IDLEV(h)  = level;
   IDNEXT(h) = this;
+  BOOLEAN at_start=(this==IDROOT);
   h->id_i=iiS2I(s);
   if (init)
@@ -221 +222 @@
   }
   // --------------------------------------------------------
+  if (at_start)
+    IDNEXT(h) = IDROOT;
   return  h;
 }