[simspark-cvs] simspark/spark/zeitgeist leaf.h, 1.1.2.1.2.2, 1.1.2.1.2.3

[Oliver O. <fr...@us...>]

Update of /cvsroot/simspark/simspark/spark/zeitgeist
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv23034

Modified Files:
      Tag: projectx
	leaf.h 
Log Message:
merge from HEAD


Index: leaf.h
===================================================================
RCS file: /cvsroot/simspark/simspark/spark/zeitgeist/leaf.h,v
retrieving revision 1.1.2.1.2.2
retrieving revision 1.1.2.1.2.3
diff -C2 -d -r1.1.2.1.2.2 -r1.1.2.1.2.3
*** leaf.h	8 May 2007 01:36:22 -0000	1.1.2.1.2.2
--- leaf.h	17 Jun 2007 07:47:37 -0000	1.1.2.1.2.3
***************
*** 130,134 ****
                  if (recursive)
                      {
!                         return (*i)->FindChildSupportingClass<CLASS>(recursive);
                      }
              }
--- 130,138 ----
                  if (recursive)
                      {
!                         child = (*i)->FindChildSupportingClass<CLASS>(recursive);
!                         if (child.get() != 0)
!                         {
!                             return child;
!                         }
                      }
              }