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

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

Revision: 2670
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2670&view=rev
Author:   agreen
Date:     2012-01-10 17:16:21 +0000 (Tue, 10 Jan 2012)
Log Message:
-----------
Simplify sCog_Each.

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

Modified: trunk/zoolib/source/cxx/zoolib/ZCog.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCog.h	2012-01-10 05:24:58 UTC (rev 2669)
+++ trunk/zoolib/source/cxx/zoolib/ZCog.h	2012-01-10 17:16:21 UTC (rev 2670)
@@ -500,13 +500,9 @@
 	(const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable0,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable1)
 	{
-	if (sIsPending(iCallable0))
-		{
-		if (sIsPending(iCallable1))
-			return +iCallable0 >> iCallable1;
-		return iCallable0;
-		}
-	return iCallable1;
+	if (sIsFinished(iCallable0))
+		return iCallable1;
+	return +iCallable0 >> iCallable1;
 	}
 
 template <class Param>

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