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

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

Revision: 2663
          http://zoolib.svn.sourceforge.net/zoolib/?rev=2663&view=rev
Author:   agreen
Date:     2012-01-09 20:05:59 +0000 (Mon, 09 Jan 2012)
Log Message:
-----------
Conform to changes elsewhere.

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

Modified: trunk/zoolib/source/cxx/zoolib/ZCog_Std.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCog_Std.h	2012-01-09 20:05:33 UTC (rev 2662)
+++ trunk/zoolib/source/cxx/zoolib/ZCog_Std.h	2012-01-09 20:05:59 UTC (rev 2663)
@@ -35,7 +35,7 @@
 	ZTime iSystemTime)
 	{
 	if (ZTime::sSystem() > iSystemTime)
-		return sCog_Term<Param>();
+		return true;
 	return iSelf;
 	}
 
@@ -69,22 +69,22 @@
 template <class Param>
 ZCog<Param> sCog_StartAt(ZTime iSystemTime,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable)
-	{ return sCog_DelayUntil<Param>(iSystemTime) | iCallable; }
+	{ return sCog_DelayUntil<Param>(iSystemTime) >> iCallable; }
 
 template <class Param>
 ZCog<Param> sCog_StopAt(ZTime iSystemTime,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >& iCallable)
-	{ return sCog_DelayUntil<Param>(iSystemTime) * iCallable; }
+	{ return sCog_DelayUntil<Param>(iSystemTime) | iCallable; }
 
 template <class Param>
 ZCog<Param> sCog_StartAfter(double iDelay,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >iCallable)
-	{ return sCog_DelayFor<Param>(iDelay) | iCallable; }
+	{ return sCog_DelayFor<Param>(iDelay) >> iCallable; }
 
 template <class Param>
 ZCog<Param> sCog_StopAfter(double iDelay,
 	const ZRef<ZCallable<ZCog<Param>(const ZCog<Param>&,Param)> >iCallable)
-	{ return sCog_DelayFor<Param>(iDelay) * iCallable; }
+	{ return sCog_DelayFor<Param>(iDelay) | iCallable; }
 
 } // namespace ZooLib
 

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