[ZooLib-checkins] SF.net SVN: zoolib:[2600] trunk/zoolib/source/cxx/zoolib/ZCog.h

[<ag...@us...>]

Revision: 2600
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2600&view=rev
Author:   agreen
Date:     2011-10-30 23:05:36 +0000 (Sun, 30 Oct 2011)
Log Message:
-----------
WhileUnchanged returns iCallable0 if iCallable1 is null.

Modified Paths:
--------------
    trunk/zoolib/source/cxx/zoolib/ZCog.h

Modified: trunk/zoolib/source/cxx/zoolib/ZCog.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCog.h	2011-10-30 02:56:11 UTC (rev 2599)
+++ trunk/zoolib/source/cxx/zoolib/ZCog.h	2011-10-30 23:05:36 UTC (rev 2600)
@@ -641,8 +641,12 @@
 	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
 	{
-	if (iCallable0 && iCallable1)
-		return spCog_WhileUnchanged(iCallable0, iCallable1);
+	if (iCallable0)
+		{
+		if (iCallable1)
+			return spCog_WhileUnchanged(iCallable0, iCallable1);
+		return iCallable0;
+		}
 	return null;
 	}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.