[Lemon-commits] [lemon_svn] klao: r1225 - hugo/trunk/src/hugo

[Lemon SVN]

Author: klao
Date: Tue Sep 28 12:32:23 2004
New Revision: 1225

Modified:
   hugo/trunk/src/hugo/unionfind.h

Log:
Bugfix. (unionfind segfaulted when compiled with icc)


Modified: hugo/trunk/src/hugo/unionfind.h
==============================================================================
--- hugo/trunk/src/hugo/unionfind.h	(original)
+++ hugo/trunk/src/hugo/unionfind.h	Tue Sep 28 12:32:23 2004
@@ -446,7 +446,8 @@
       if (lai == clit)
 	return false;
 
-      ItemList &c = *clit->my_class;
+      ItemList &cl = *clit->my_class,
+	&al = *lai->my_class;
 
       bool is_leader = (lai == ai);
       bool singleton = false;
@@ -455,7 +456,7 @@
 	++lai;
       }
 
-      c.splice(c.end(), *lai->my_class, ai);
+      cl.splice(cl.end(), al, ai);
 
       if (is_leader) {
 	if (ai->size == 1) {
@@ -468,7 +469,7 @@
 	}
       }
       if (!singleton) {
-	for (IIter i = lai; i != lai->my_class->end(); ++i)
+	for (IIter i = lai; i != al.end(); ++i)
 	  i->parent = lai;
 	--lai->size;
       }