Menu
▾
▴
zoolib-checkins
|
From: <ag...@us...> - 2012-01-15 05:08:06
|
Revision: 2676
http://zoolib.svn.sourceforge.net/zoolib/?rev=2676&view=rev
Author: agreen
Date: 2012-01-15 05:07:51 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
OK. I'll be moving to Lion soon, at which point CodeWarrior becomes archaic. For some reason
"#pragma mark" never propogated out of the Mac world. I just discovered that "// MARK:" has the
same effect in XCode, and a "// XCode: -" prefix puts a divider into the function popup.
I'm not on XCode 4 yeat, but will be soon enough.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Dataspace.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceMUX.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_SourceServer.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Asyncify.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Asyncify.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Client.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_SQLite.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.h
trunk/zoolib/source/cxx/more/zoolib/datonset/ZDatonSet.cpp
trunk/zoolib/source/cxx/more/zoolib/datonset/ZDatonSet.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_AppleDouble.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_AppleDouble.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_JPEG.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_JPEG.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Val.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Val.h
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Yad.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime_Yad.h
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine.cpp
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine.h
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Geometry.h
trunk/zoolib/source/cxx/more/zoolib/gameengine/ZGameEngine_Tweens.h
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest_Std.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Guest_Std.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Cocoa.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Cocoa.mm
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Mac.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Std.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Host_Win.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Object.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_ObjectPriv.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Variant.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_Variant.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_VariantPriv.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Util.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.h
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Yad.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Yad.h
trunk/zoolib/source/cxx/more/zoolib/sqlite/ZSQLite.cpp
trunk/zoolib/source/cxx/more/zoolib/sqlite/ZSQLite.h
trunk/zoolib/source/cxx/more/zoolib/sqlite/ZSQLite_YadSeqR_Iter.cpp
trunk/zoolib/source/cxx/more/zoolib/sqlite/ZSQLite_YadSeqR_Iter.h
trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.h
trunk/zoolib/source/cxx/more/zoolib/uikit/UITVController_WithSections.mm
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_DoQuery.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_DoQuery.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Result.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Transform_Search.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Transform_Search.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Visitor_DoMakeWalker.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Visitor_DoMakeWalker.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Calc.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Calc.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Const.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Const.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Dee.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Dee.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Dum.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Dum.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Embed.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Embed.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Product.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Product.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Project.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Project.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Rename.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Restrict.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Restrict.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Result.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Result.h
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Walker_Union.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_AsSQL.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_GetRelHead.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelHead.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_RelName.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_ConsolidateRenames.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_ConsolidateRenames.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_DecomposeRestricts.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_DecomposeRestricts.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_PushDownRestricts.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Transform_PushDownRestricts.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_Strim_Rel.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_Strim_Rel.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_Strim_RelHead.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Util_Strim_RelHead.h
trunk/zoolib/source/cxx/old/zoolib/ZASCompiler.cpp
trunk/zoolib/source/cxx/old/zoolib/ZASCompiler.h
trunk/zoolib/source/cxx/old/zoolib/ZASParser.cpp
trunk/zoolib/source/cxx/old/zoolib/ZASParser.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset.cpp
trunk/zoolib/source/cxx/old/zoolib/ZAsset.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_FS.cpp
trunk/zoolib/source/cxx/old/zoolib/ZAsset_FS.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_MacOS.cpp
trunk/zoolib/source/cxx/old/zoolib/ZAsset_MacOS.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_POSIX.cpp
trunk/zoolib/source/cxx/old/zoolib/ZAsset_POSIX.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_Std.cpp
trunk/zoolib/source/cxx/old/zoolib/ZAsset_Std.h
trunk/zoolib/source/cxx/old/zoolib/ZAsset_Win.cpp
trunk/zoolib/source/cxx/old/zoolib/ZAsset_Win.h
trunk/zoolib/source/cxx/old/zoolib/ZDC.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC.h
trunk/zoolib/source/cxx/old/zoolib/ZDCGlyphServer.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCGlyphServer.h
trunk/zoolib/source/cxx/old/zoolib/ZDCGlyphServer_Asset.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCGlyphServer_Asset.h
trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCInk.h
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmapCombo.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmapCombo.h
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.h
trunk/zoolib/source/cxx/old/zoolib/ZDCRgn.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCRgn.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_X.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZMutexComposite.cpp
trunk/zoolib/source/cxx/old/zoolib/ZMutexComposite.h
trunk/zoolib/source/cxx/old/zoolib/ZNode.cpp
trunk/zoolib/source/cxx/old/zoolib/ZNode.h
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.cpp
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Wrapper.cpp
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Wrapper.h
trunk/zoolib/source/cxx/old/zoolib/ZNode_FS.cpp
trunk/zoolib/source/cxx/old/zoolib/ZNode_FS.h
trunk/zoolib/source/cxx/old/zoolib/ZProgressWatcher.cpp
trunk/zoolib/source/cxx/old/zoolib/ZProgressWatcher.h
trunk/zoolib/source/cxx/old/zoolib/ZStreamMUX.cpp
trunk/zoolib/source/cxx/old/zoolib/ZStreamMUX.h
trunk/zoolib/source/cxx/old/zoolib/ZStream_JNI.cpp
trunk/zoolib/source/cxx/old/zoolib/ZStream_JNI.h
trunk/zoolib/source/cxx/old/zoolib/ZTS_Umbrella.cpp
trunk/zoolib/source/cxx/old/zoolib/ZTS_Umbrella.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.h
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZWebDAV.cpp
trunk/zoolib/source/cxx/old/zoolib/ZXLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZXServer.cpp
trunk/zoolib/source/cxx/old/zoolib/ZXServer.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStream.cpp
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStream.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.h
trunk/zoolib/source/cxx/zoolib/ZAccumulator_T.h
trunk/zoolib/source/cxx/zoolib/ZAny.cpp
trunk/zoolib/source/cxx/zoolib/ZAny.h
trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp
trunk/zoolib/source/cxx/zoolib/ZAtomic.h
trunk/zoolib/source/cxx/zoolib/ZBigRegion.cpp
trunk/zoolib/source/cxx/zoolib/ZBigRegion.h
trunk/zoolib/source/cxx/zoolib/ZBitStream.cpp
trunk/zoolib/source/cxx/zoolib/ZBitStream.h
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h
trunk/zoolib/source/cxx/zoolib/ZByteSwap.h
trunk/zoolib/source/cxx/zoolib/ZCallByCaller.h
trunk/zoolib/source/cxx/zoolib/ZCallScheduler.cpp
trunk/zoolib/source/cxx/zoolib/ZCallScheduler.h
trunk/zoolib/source/cxx/zoolib/ZCallable.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Bind.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Block.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Bool.cpp
trunk/zoolib/source/cxx/zoolib/ZCallable_Bool.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Caller.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Compound.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Const.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Delay.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Function.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Indirect.h
trunk/zoolib/source/cxx/zoolib/ZCallable_ObjC.h
trunk/zoolib/source/cxx/zoolib/ZCallable_PMF.h
trunk/zoolib/source/cxx/zoolib/ZCallable_Set.h
trunk/zoolib/source/cxx/zoolib/ZCaller.h
trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.cpp
trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h
trunk/zoolib/source/cxx/zoolib/ZCaller_CarbonEvents.cpp
trunk/zoolib/source/cxx/zoolib/ZCaller_CarbonEvents.h
trunk/zoolib/source/cxx/zoolib/ZCaller_EventLoop.cpp
trunk/zoolib/source/cxx/zoolib/ZCaller_EventLoop.h
trunk/zoolib/source/cxx/zoolib/ZCaller_Thread.h
trunk/zoolib/source/cxx/zoolib/ZCaller_WinMessageLoop.cpp
trunk/zoolib/source/cxx/zoolib/ZCaller_WinMessageLoop.h
trunk/zoolib/source/cxx/zoolib/ZCog.h
trunk/zoolib/source/cxx/zoolib/ZCommandLine.cpp
trunk/zoolib/source/cxx/zoolib/ZCommandLine.h
trunk/zoolib/source/cxx/zoolib/ZCommandLine_TValue.cpp
trunk/zoolib/source/cxx/zoolib/ZCommandLine_TValue.h
trunk/zoolib/source/cxx/zoolib/ZCompare.cpp
trunk/zoolib/source/cxx/zoolib/ZCompare.h
trunk/zoolib/source/cxx/zoolib/ZCompare_String.h
trunk/zoolib/source/cxx/zoolib/ZCompare_T.h
trunk/zoolib/source/cxx/zoolib/ZCompat_MSVCStaticLib.h
trunk/zoolib/source/cxx/zoolib/ZCounted.cpp
trunk/zoolib/source/cxx/zoolib/ZCounted.h
trunk/zoolib/source/cxx/zoolib/ZCountedVal.h
trunk/zoolib/source/cxx/zoolib/ZCountedWithoutFinalize.cpp
trunk/zoolib/source/cxx/zoolib/ZCountedWithoutFinalize.h
trunk/zoolib/source/cxx/zoolib/ZCtorDtor.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmap.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmap.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlitPriv.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_GIF.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_JPEGLib.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_PNG.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapNS.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.h
trunk/zoolib/source/cxx/zoolib/ZDList.h
trunk/zoolib/source/cxx/zoolib/ZData_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZData_Any.h
trunk/zoolib/source/cxx/zoolib/ZData_CF.cpp
trunk/zoolib/source/cxx/zoolib/ZData_CF.h
trunk/zoolib/source/cxx/zoolib/ZData_NS.h
trunk/zoolib/source/cxx/zoolib/ZData_NS.mm
trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.h
trunk/zoolib/source/cxx/zoolib/ZDelegate.h
trunk/zoolib/source/cxx/zoolib/ZDelegate.mm
trunk/zoolib/source/cxx/zoolib/ZExpr.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
trunk/zoolib/source/cxx/zoolib/ZFile.cpp
trunk/zoolib/source/cxx/zoolib/ZFile.h
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.h
trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZFile_Win.h
trunk/zoolib/source/cxx/zoolib/ZFunctionChain.h
trunk/zoolib/source/cxx/zoolib/ZGRgn.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgn.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_BigRegion.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_HRGN.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_HRGN.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_RgnHandle.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_RgnHandle.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_XRegion.cpp
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_XRegion.h
trunk/zoolib/source/cxx/zoolib/ZGeom.h
trunk/zoolib/source/cxx/zoolib/ZGeomPOD.cpp
trunk/zoolib/source/cxx/zoolib/ZGeomPOD.h
trunk/zoolib/source/cxx/zoolib/ZGeometry.h
trunk/zoolib/source/cxx/zoolib/ZHTTP.cpp
trunk/zoolib/source/cxx/zoolib/ZHTTP.h
trunk/zoolib/source/cxx/zoolib/ZHTTP_Requests.cpp
trunk/zoolib/source/cxx/zoolib/ZHTTP_Requests.h
trunk/zoolib/source/cxx/zoolib/ZHandle_T.h
trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.cpp
trunk/zoolib/source/cxx/zoolib/ZIntervalTreeClock.h
trunk/zoolib/source/cxx/zoolib/ZLog.cpp
trunk/zoolib/source/cxx/zoolib/ZLog.h
trunk/zoolib/source/cxx/zoolib/ZMIME.cpp
trunk/zoolib/source/cxx/zoolib/ZMIME.h
trunk/zoolib/source/cxx/zoolib/ZML.cpp
trunk/zoolib/source/cxx/zoolib/ZML.h
trunk/zoolib/source/cxx/zoolib/ZMap_CFPreferences.cpp
trunk/zoolib/source/cxx/zoolib/ZMap_CFPreferences.h
trunk/zoolib/source/cxx/zoolib/ZMatrix.h
trunk/zoolib/source/cxx/zoolib/ZMemory.cpp
trunk/zoolib/source/cxx/zoolib/ZMemory.h
trunk/zoolib/source/cxx/zoolib/ZMulti_T.h
trunk/zoolib/source/cxx/zoolib/ZNatter.cpp
trunk/zoolib/source/cxx/zoolib/ZNatter.h
trunk/zoolib/source/cxx/zoolib/ZNet.cpp
trunk/zoolib/source/cxx/zoolib/ZNet.h
trunk/zoolib/source/cxx/zoolib/ZNetDNSSD.cpp
trunk/zoolib/source/cxx/zoolib/ZNetDNSSD.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_WinSock.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_WinSock.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Local.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM_OSX.mm
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZObjC.h
trunk/zoolib/source/cxx/zoolib/ZObjC.mm
trunk/zoolib/source/cxx/zoolib/ZObserver.h
trunk/zoolib/source/cxx/zoolib/ZObserver.mm
trunk/zoolib/source/cxx/zoolib/ZPromise.h
trunk/zoolib/source/cxx/zoolib/ZQ.h
trunk/zoolib/source/cxx/zoolib/ZRGBA.cpp
trunk/zoolib/source/cxx/zoolib/ZRGBA.h
trunk/zoolib/source/cxx/zoolib/ZRGBColor.h
trunk/zoolib/source/cxx/zoolib/ZRef.h
trunk/zoolib/source/cxx/zoolib/ZRef_NS.h
trunk/zoolib/source/cxx/zoolib/ZRef_NS.mm
trunk/zoolib/source/cxx/zoolib/ZRoster.cpp
trunk/zoolib/source/cxx/zoolib/ZRoster.h
trunk/zoolib/source/cxx/zoolib/ZSOCKS.cpp
trunk/zoolib/source/cxx/zoolib/ZSOCKS.h
trunk/zoolib/source/cxx/zoolib/ZSafe.h
trunk/zoolib/source/cxx/zoolib/ZSafeSet.h
trunk/zoolib/source/cxx/zoolib/ZSaveRestore_T.h
trunk/zoolib/source/cxx/zoolib/ZServer.cpp
trunk/zoolib/source/cxx/zoolib/ZServer.h
trunk/zoolib/source/cxx/zoolib/ZSetRestore_T.h
trunk/zoolib/source/cxx/zoolib/ZSet_T.h
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.cpp
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.h
trunk/zoolib/source/cxx/zoolib/ZStdInt.h
trunk/zoolib/source/cxx/zoolib/ZStream.cpp
trunk/zoolib/source/cxx/zoolib/ZStream.h
trunk/zoolib/source/cxx/zoolib/ZStreamRPos_StreamR.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRPos_StreamR.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_MemoryPipe.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_MemoryPipe.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_OpenSSL.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_OpenSSL.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_OSX.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRWCon_SSL_Win.h
trunk/zoolib/source/cxx/zoolib/ZStreamRWPos_RAM.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRWPos_RAM.h
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.h
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FlushOnRead.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Boundary.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamR_Boundary.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Cat.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamR_Cat.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_HexStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamR_HexStrim.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Random.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamR_Random.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_SkipAllOnDestroy.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamR_SkipAllOnDestroy.h
trunk/zoolib/source/cxx/zoolib/ZStreamR_Source.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamR_Source.h
trunk/zoolib/source/cxx/zoolib/ZStreamW_Fragmented.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamW_Fragmented.h
trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamW_HexStrim.h
trunk/zoolib/source/cxx/zoolib/ZStream_ASCIIStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_ASCIIStrim.h
trunk/zoolib/source/cxx/zoolib/ZStream_Base64.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Base64.h
trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Buffered.h
trunk/zoolib/source/cxx/zoolib/ZStream_CFStream.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_CFStream.h
trunk/zoolib/source/cxx/zoolib/ZStream_CGData.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_CGData.h
trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.h
trunk/zoolib/source/cxx/zoolib/ZStream_Chunked.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Chunked.h
trunk/zoolib/source/cxx/zoolib/ZStream_Compressed.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Compressed.h
trunk/zoolib/source/cxx/zoolib/ZStream_Count.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Count.h
trunk/zoolib/source/cxx/zoolib/ZStream_Data_T.h
trunk/zoolib/source/cxx/zoolib/ZStream_Filter.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Filter.h
trunk/zoolib/source/cxx/zoolib/ZStream_LZW.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_LZW.h
trunk/zoolib/source/cxx/zoolib/ZStream_Limited.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Limited.h
trunk/zoolib/source/cxx/zoolib/ZStream_MD5.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_MD5.h
trunk/zoolib/source/cxx/zoolib/ZStream_Mac.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Mac.h
trunk/zoolib/source/cxx/zoolib/ZStream_Memory.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Memory.h
trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.h
trunk/zoolib/source/cxx/zoolib/ZStream_PageBuffered.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_PageBuffered.h
trunk/zoolib/source/cxx/zoolib/ZStream_RateCapped.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_RateCapped.h
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.h
trunk/zoolib/source/cxx/zoolib/ZStream_String.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_String.h
trunk/zoolib/source/cxx/zoolib/ZStream_Tee.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Tee.h
trunk/zoolib/source/cxx/zoolib/ZStream_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_Win.h
trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.h
trunk/zoolib/source/cxx/zoolib/ZStream_bzip2.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_bzip2.h
trunk/zoolib/source/cxx/zoolib/ZStreamer.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamer.h
trunk/zoolib/source/cxx/zoolib/ZStreamerFactory_Precon.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamerFactory_Precon.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRPos_StreamR.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamerRPos_StreamR.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Buffered.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Buffered.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Fallback.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Fallback.h
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Retry.cpp
trunk/zoolib/source/cxx/zoolib/ZStreamerRWFactory_Retry.h
trunk/zoolib/source/cxx/zoolib/ZStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim.h
trunk/zoolib/source/cxx/zoolib/ZStrimR_Boundary.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimR_Boundary.h
trunk/zoolib/source/cxx/zoolib/ZStrimR_Rewind.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimR_Rewind.h
trunk/zoolib/source/cxx/zoolib/ZStrimU_Std.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimU_Std.h
trunk/zoolib/source/cxx/zoolib/ZStrimU_StreamUTF8Buffered.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimU_StreamUTF8Buffered.h
trunk/zoolib/source/cxx/zoolib/ZStrimU_Unreader.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimU_Unreader.h
trunk/zoolib/source/cxx/zoolib/ZStrimW_WinDebug.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimW_WinDebug.h
trunk/zoolib/source/cxx/zoolib/ZStrim_CFString.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim_CFString.h
trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Escaped.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim_Escaped.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Limited.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim_Limited.h
trunk/zoolib/source/cxx/zoolib/ZStrim_NSString.h
trunk/zoolib/source/cxx/zoolib/ZStrim_NSString.mm
trunk/zoolib/source/cxx/zoolib/ZStrim_Stream.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim_Stream.h
trunk/zoolib/source/cxx/zoolib/ZStrim_Tee.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim_Tee.h
trunk/zoolib/source/cxx/zoolib/ZStrimmer.cpp
trunk/zoolib/source/cxx/zoolib/ZStrimmer.h
trunk/zoolib/source/cxx/zoolib/ZStrimmer_Stream.h
trunk/zoolib/source/cxx/zoolib/ZStrimmer_Streamer.h
trunk/zoolib/source/cxx/zoolib/ZTName.cpp
trunk/zoolib/source/cxx/zoolib/ZTName.h
trunk/zoolib/source/cxx/zoolib/ZTagVal.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_ICU.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_ICU.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Mac.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Mac.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Std.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Std.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Unicode.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Unicode.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_iconv.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_iconv.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCollator.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ASCII.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ASCII.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.h
trunk/zoolib/source/cxx/zoolib/ZThread.cpp
trunk/zoolib/source/cxx/zoolib/ZThread.h
trunk/zoolib/source/cxx/zoolib/ZThreadSafe.h
trunk/zoolib/source/cxx/zoolib/ZThreadVal.h
trunk/zoolib/source/cxx/zoolib/ZThread_MacMP.cpp
trunk/zoolib/source/cxx/zoolib/ZThread_MacMP.h
trunk/zoolib/source/cxx/zoolib/ZThread_T.h
trunk/zoolib/source/cxx/zoolib/ZThread_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZThread_Win.h
trunk/zoolib/source/cxx/zoolib/ZThread_boost.cpp
trunk/zoolib/source/cxx/zoolib/ZThread_boost.h
trunk/zoolib/source/cxx/zoolib/ZThread_pthread.cpp
trunk/zoolib/source/cxx/zoolib/ZThread_pthread.h
trunk/zoolib/source/cxx/zoolib/ZTime.cpp
trunk/zoolib/source/cxx/zoolib/ZTime.h
trunk/zoolib/source/cxx/zoolib/ZTrail.cpp
trunk/zoolib/source/cxx/zoolib/ZTrail.h
trunk/zoolib/source/cxx/zoolib/ZTween.h
trunk/zoolib/source/cxx/zoolib/ZTween_Std.h
trunk/zoolib/source/cxx/zoolib/ZTxn.cpp
trunk/zoolib/source/cxx/zoolib/ZTxn.h
trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.h
trunk/zoolib/source/cxx/zoolib/ZUniSet_T.h
trunk/zoolib/source/cxx/zoolib/ZUnicode.cpp
trunk/zoolib/source/cxx/zoolib/ZUnicode.h
trunk/zoolib/source/cxx/zoolib/ZUnicodePriv.h
trunk/zoolib/source/cxx/zoolib/ZUnicodePrivB.h
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize.cpp
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize.h
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize_CF.cpp
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize_ICU.cpp
trunk/zoolib/source/cxx/zoolib/ZUnicode_Normalize_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
trunk/zoolib/source/cxx/zoolib/ZUtil_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CF.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_CF.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CF_Context.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_CarbonEvents.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Debug.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Debug.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Expr_Bool_CNF.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Expr_Bool_CNF.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Expr_Bool_ValPred_Rename.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Expr_Bool_ValPred_Rename.h
trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_MacOSX.h
trunk/zoolib/source/cxx/zoolib/ZUtil_NS.h
trunk/zoolib/source/cxx/zoolib/ZUtil_NS.mm
trunk/zoolib/source/cxx/zoolib/ZUtil_POSIXFD.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_POSIXFD.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_map.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_set.h
trunk/zoolib/source/cxx/zoolib/ZUtil_STL_vector.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Data.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_Data.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_IntervalTreeClock.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_IntervalTreeClock.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_ValPred_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Strim_ValPred_Any.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Strimmer.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Strimmer.h
trunk/zoolib/source/cxx/zoolib/ZUtil_SystemConfiguration.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_SystemConfiguration.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Time.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Time.h
trunk/zoolib/source/cxx/zoolib/ZUtil_WinFile.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_WinFile.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Yad.h
trunk/zoolib/source/cxx/zoolib/ZUtil_string.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_string.h
trunk/zoolib/source/cxx/zoolib/ZVal.cpp
trunk/zoolib/source/cxx/zoolib/ZVal.h
trunk/zoolib/source/cxx/zoolib/ZValAccessors.h
trunk/zoolib/source/cxx/zoolib/ZValAccessors_Std.h
trunk/zoolib/source/cxx/zoolib/ZValPred.cpp
trunk/zoolib/source/cxx/zoolib/ZValPred.h
trunk/zoolib/source/cxx/zoolib/ZValPred_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZValPred_Any.h
trunk/zoolib/source/cxx/zoolib/ZValPred_GetNames.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Any.h
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZVal_CF.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_CF.h
trunk/zoolib/source/cxx/zoolib/ZVal_NS.h
trunk/zoolib/source/cxx/zoolib/ZVal_NS.mm
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.h
trunk/zoolib/source/cxx/zoolib/ZVisitor.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Do_T.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_Do_Eval.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_Do_Eval.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ToStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ToStrim.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Any_Do_Eval_Matches.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Any_ToStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Any_ToStrim.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Do_GetNames.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Bool_ValPred_Do_GetNames.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_Expr_Op_Do_Transform_T.h
trunk/zoolib/source/cxx/zoolib/ZVisitor_ToStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor_ToStrim.h
trunk/zoolib/source/cxx/zoolib/ZWND.cpp
trunk/zoolib/source/cxx/zoolib/ZWND.h
trunk/zoolib/source/cxx/zoolib/ZWinCOM.cpp
trunk/zoolib/source/cxx/zoolib/ZWinCOM.h
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.cpp
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Val.h
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZWinRegistry_Yad.h
trunk/zoolib/source/cxx/zoolib/ZWinService.cpp
trunk/zoolib/source/cxx/zoolib/ZWinService.h
trunk/zoolib/source/cxx/zoolib/ZWinWND.cpp
trunk/zoolib/source/cxx/zoolib/ZWinWND.h
trunk/zoolib/source/cxx/zoolib/ZWorker.cpp
trunk/zoolib/source/cxx/zoolib/ZWorker.h
trunk/zoolib/source/cxx/zoolib/ZYad.cpp
trunk/zoolib/source/cxx/zoolib/ZYad.h
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
trunk/zoolib/source/cxx/zoolib/ZYadTree.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_Any.h
trunk/zoolib/source/cxx/zoolib/ZYad_AppleEvent.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZYad_Basic.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_Basic.h
trunk/zoolib/source/cxx/zoolib/ZYad_Bencode.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_Bencode.h
trunk/zoolib/source/cxx/zoolib/ZYad_CF.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_CF.h
trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_DividedValues.h
trunk/zoolib/source/cxx/zoolib/ZYad_FS.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_FS.h
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.h
trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.h
trunk/zoolib/source/cxx/zoolib/ZYad_ML.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_ML.h
trunk/zoolib/source/cxx/zoolib/ZYad_MapAsSeq.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_MapAsSeq.h
trunk/zoolib/source/cxx/zoolib/ZYad_NS.h
trunk/zoolib/source/cxx/zoolib/ZYad_NS.mm
trunk/zoolib/source/cxx/zoolib/ZYad_Simple.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_Simple.h
trunk/zoolib/source/cxx/zoolib/ZYad_Std.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_Std.h
trunk/zoolib/source/cxx/zoolib/ZYad_Val_T.h
trunk/zoolib/source/cxx/zoolib/ZYad_XMLAttr.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLAttr.h
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.h
trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.h
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -28,8 +28,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager
+// MARK: - ZBlackBerry::Manager
/**
\class Manager
@@ -52,8 +51,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Device
+// MARK: - ZBlackBerry::Device
/**
\class Device
@@ -83,8 +81,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Channel
+// MARK: - ZBlackBerry::Channel
/**
\class Channel
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -44,8 +44,7 @@
class Channel;
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager
+// MARK: - ZBlackBerry::Manager
class Manager : public ZCounted
{
@@ -71,8 +70,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Device
+// MARK: - ZBlackBerry::Device
class Device : public ZCounted
{
@@ -114,8 +112,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Channel
+// MARK: - ZBlackBerry::Channel
class Channel : public ZStreamerRWCon
{
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryCOM.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -38,8 +38,7 @@
namespace ZBlackBerryCOM {
// =================================================================================================
-#pragma mark -
-#pragma mark * IChannelEvents
+// MARK: - IChannelEvents
ZMACRO_WinCOM_Class(IChannelEvents, IUnknown,
C7168312,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
@@ -51,8 +50,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IChannel
+// MARK: - IChannel
struct ChannelParams
{
@@ -74,8 +72,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDeviceProperty
+// MARK: - IDeviceProperty
ZMACRO_WinCOM_Class(IDeviceProperty, IUnknown,
C7168310,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
@@ -85,8 +82,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDeviceProperties
+// MARK: - IDeviceProperties
ZMACRO_WinCOM_Class(IDeviceProperties, IUnknown,
C716830F,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
@@ -96,8 +92,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDevice
+// MARK: - IDevice
ZMACRO_WinCOM_Class(IDevice, IUnknown,
C716830E,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
@@ -113,8 +108,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDevices
+// MARK: - IDevices
ZMACRO_WinCOM_Class(IDevices, IUnknown,
C716830D,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
@@ -124,8 +118,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDeviceManagerEvents
+// MARK: - IDeviceManagerEvents
ZMACRO_WinCOM_Class(IDeviceManagerEvents, IUnknown,
C716830C,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
@@ -135,8 +128,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDeviceManagerNotification
+// MARK: - IDeviceManagerNotification
ZMACRO_WinCOM_Class(IDeviceManagerNotification, IDeviceManagerEvents,
5F67EACC,D387,4B71,96,37,59,69,01,D0,0C,E0)
@@ -147,8 +139,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * IDeviceManager
+// MARK: - IDeviceManager
ZMACRO_WinCOM_Class(IDeviceManager, IUnknown,
C716830B,A0F4,46DF,B8,2A,54,8C,FB,08,75,5E)
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -35,8 +35,7 @@
namespace ZooLib {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerryServer::Handler_ManagerChanged
+// MARK: - ZBlackBerryServer::Handler_ManagerChanged
class ZBlackBerryServer::Handler_ManagerChanged
: public ZCommer
@@ -152,8 +151,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerryServer::Handler_DeviceFinished
+// MARK: - ZBlackBerryServer::Handler_DeviceFinished
class ZBlackBerryServer::Handler_DeviceFinished
: public ZCommer
@@ -237,8 +235,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerryServer
+// MARK: - ZBlackBerryServer
static string spReadString(const ZStreamR& r)
{
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerryServer.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -29,8 +29,7 @@
namespace ZooLib {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerryServer
+// MARK: - ZBlackBerryServer
class ZBlackBerryServer
{
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -41,8 +41,7 @@
using namespace ZWinCOM;
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Channel_BBDevMgr
+// MARK: - ZBlackBerry::Channel_BBDevMgr
class Channel_BBDevMgr
: private IChannelEvents,
@@ -465,8 +464,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Device_BBDevMgr
+// MARK: - ZBlackBerry::Device_BBDevMgr
class Device_BBDevMgr : public Device
{
@@ -603,8 +601,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager_BBDevMgr
+// MARK: - ZBlackBerry::Manager_BBDevMgr
Manager_BBDevMgr::Manager_BBDevMgr()
: fNextID(1)
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -44,8 +44,7 @@
class Device_BBDevMgr;
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager_BBDevMgr
+// MARK: - ZBlackBerry::Manager_BBDevMgr
class Manager_BBDevMgr
: private ZBlackBerryCOM::IDeviceManagerEvents,
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -33,8 +33,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * Channel_Client
+// MARK: - Channel_Client
class Channel_Client
: public Channel,
@@ -125,8 +124,7 @@
{ fSRWCon->GetStreamWCon().Abort(); }
// =================================================================================================
-#pragma mark -
-#pragma mark * Device_Client
+// MARK: - Device_Client
class Device_Client
: public Device,
@@ -312,8 +310,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * Manager_Client::Commer_Changed
+// MARK: - Manager_Client::Commer_Changed
class Manager_Client::Commer_Changed : public ZCommer
{
@@ -397,8 +394,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * Manager_Client
+// MARK: - Manager_Client
Manager_Client::Manager_Client()
{}
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -28,8 +28,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * Manager_Client
+// MARK: - Manager_Client
class Manager_Client
: public Manager
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -37,8 +37,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * BlackBerry USB stuff
+// MARK: - BlackBerry USB stuff
static bool spSendControlMessage(IOUSBDeviceInterface182** iUDI,
uint8_t bRequestType, uint8_t bRequest,
@@ -158,8 +157,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager_OSXUSB
+// MARK: - ZBlackBerry::Manager_OSXUSB
Manager_OSXUSB::Manager_OSXUSB(CFRunLoopRef iRunLoopRef, bool iAllowMassStorage)
: fRunLoopRef(iRunLoopRef),
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -53,8 +53,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager_OSXUSB
+// MARK: - ZBlackBerry::Manager_OSXUSB
class Manager_OSXUSB
: public Manager
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -40,8 +40,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * Protocol constants
+// MARK: - Protocol constants
enum EMsg
{
@@ -131,8 +130,7 @@
*/
// =================================================================================================
-#pragma mark -
-#pragma mark * StreamW_Chunked
+// MARK: - StreamW_Chunked
class StreamW_Chunked : public ZStreamW
{
@@ -183,8 +181,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Commer_Streamer declaration
+// MARK: - ZBlackBerry::Commer_Streamer declaration
class Channel_Streamer;
@@ -270,8 +267,7 @@
};
// =================================================================================================
-#pragma mark -
-#pragma mark * Channel_Streamer
+// MARK: - Channel_Streamer
class Channel_Streamer
: public ZBlackBerry::Channel,
@@ -461,8 +457,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * Commer_Streamer definition
+// MARK: - Commer_Streamer definition
Commer_Streamer::Commer_Streamer(ZRef<ZStreamerR> iStreamerR, ZRef<ZStreamerW> iStreamerW)
: ZCommer(iStreamerR, iStreamerW),
@@ -1562,8 +1557,7 @@
}
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Device_Streamer
+// MARK: - ZBlackBerry::Device_Streamer
Device_Streamer::Device_Streamer(ZRef<ZStreamerR> iStreamerR, ZRef<ZStreamerW> iStreamerW)
: fStreamerR(iStreamerR),
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Streamer.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -31,8 +31,7 @@
class Commer_Streamer;
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Device_Streamer
+// MARK: - ZBlackBerry::Device_Streamer
class Device_Streamer
: public Device
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -29,8 +29,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager_Union
+// MARK: - ZBlackBerry::Manager_Union
Manager_Union::Manager_Union(const vector<ZRef<Manager> >& iManagers)
{
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Union.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -28,8 +28,7 @@
namespace ZBlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZBlackBerry::Manager_Union
+// MARK: - ZBlackBerry::Manager_Union
class Manager_Union
: public Manager,
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.cpp 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.cpp 2012-01-15 05:07:51 UTC (rev 2676)
@@ -34,8 +34,7 @@
namespace ZUtil_BlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZUtil_BlackBerry
+// MARK: - ZUtil_BlackBerry
ZRef<ZBlackBerry::Manager> sMakeManager(ZRef<ZStreamerRWConFactory> iFactory)
{
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h 2012-01-12 23:16:32 UTC (rev 2675)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZUtil_BlackBerry.h 2012-01-15 05:07:51 UTC (rev 2676)
@@ -28,8 +28,7 @@
namespace ZUtil_BlackBerry {
// =================================================================================================
-#pragma mark -
-#pragma mark * ZUtil_BlackBerry
+// MARK: - ZUtil_BlackBerry
ZRef<ZBlackBerry::Manager> sMakeManager(ZRef<ZStreamerRWConFactory> iFactor...
[truncated message content] |
|
From: <ag...@us...> - 2012-01-25 19:28:40
|
Revision: 2683
http://zoolib.svn.sourceforge.net/zoolib/?rev=2683&view=rev
Author: agreen
Date: 2012-01-25 19:28:33 +0000 (Wed, 25 Jan 2012)
Log Message:
-----------
Changes suggested by trial install of PVS-Studio and clang static analysis.
Modified Paths:
--------------
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZAny.cpp
trunk/zoolib/source/cxx/zoolib/ZCallable_Bind.h
trunk/zoolib/source/cxx/zoolib/ZCompare.h
trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZFunctionChain.h
trunk/zoolib/source/cxx/zoolib/ZML.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZPromise.h
trunk/zoolib/source/cxx/zoolib/ZRef.h
trunk/zoolib/source/cxx/zoolib/ZSafeSet.h
trunk/zoolib/source/cxx/zoolib/ZStream.h
trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.cpp
trunk/zoolib/source/cxx/zoolib/ZStrim.h
trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
trunk/zoolib/source/cxx/zoolib/ZUtil_CF_Context.h
trunk/zoolib/source/cxx/zoolib/ZVisitor.cpp
trunk/zoolib/source/cxx/zoolib/ZVisitor.h
trunk/zoolib/source/cxx/zoolib/ZWorker.cpp
Modified: trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -165,7 +165,6 @@
else if (typeValueLC == "id") oVal = eZType_ID;
else if (typeValueLC == "vector") oVal = eZType_Vector;
else if (typeValueLC == "type") oVal = eZType_Type;
- else if (typeValueLC == "time") oVal = eZType_Time;
//## else if (typeValueLC == "name") oVal = eZType_Name;
else
spThrowParseException("Unknown type name '" + typeValue + "'");
Modified: trunk/zoolib/source/cxx/zoolib/ZAny.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAny.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZAny.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -104,12 +104,12 @@
void ZAny::swap(ZAny& ioOther)
{
- // Simplify this for now
if (fPtr_InPlace || ioOther.fPtr_InPlace)
{
- ZAny temp = *this;
+ // Trivial implementation for now
+ const ZAny temp = *this;
*this = ioOther;
- ioOther = *this;
+ ioOther = temp;
}
else
{
Modified: trunk/zoolib/source/cxx/zoolib/ZCallable_Bind.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCallable_Bind.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZCallable_Bind.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -2644,8 +2644,6 @@
{
if (not iCallable)
return null;
- if (not iCallable)
- return null;
return new Callable_L09<typename Callable::Signature>
(i0, i1, i2, i3, i4, i5, i6, i7, i8,
iCallable);
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -35,7 +35,7 @@
{
protected:
ZCompare(const char* iTypeName);
- ~ZCompare();
+ virtual ~ZCompare();
virtual int Compare(const void* iL, const void* iR) = 0;
Modified: trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZFile_Win.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -543,13 +543,16 @@
while (bufSize < 16384)
{
vector<char> buffer(bufSize);
- DWORD result = ::GetModuleFileNameA(::GetModuleHandleA(nullptr), &buffer[0], bufSize);
- if (result < 0)
+ if (DWORD result = ::GetModuleFileNameA(::GetModuleHandleA(nullptr), &buffer[0], bufSize))
+ {
+ if (result < bufSize)
+ return sFromFullWinPath(&buffer[0]);
+ bufSize *= 2;
+ }
+ else
+ {
break;
- if (result < bufSize)
- return sFromFullWinPath(&buffer[0]);
-
- bufSize *= 2;
+ }
}
return null;
@@ -1133,13 +1136,16 @@
while (bufSize < 16384)
{
vector<UTF16> buffer(bufSize);
- DWORD result = ::GetModuleFileNameW(::GetModuleHandleW(nullptr), &buffer[0], bufSize);
- if (result < 0)
+ if (DWORD result = ::GetModuleFileNameW(::GetModuleHandleW(nullptr), &buffer[0], bufSize))
+ {
+ if (result < bufSize)
+ return sFromFullWinPath(&buffer[0]);
+ bufSize *= 2;
+ }
+ else
+ {
break;
- if (result < bufSize)
- return sFromFullWinPath(&buffer[0]);
-
- bufSize *= 2;
+ }
}
return null;
Modified: trunk/zoolib/source/cxx/zoolib/ZFunctionChain.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZFunctionChain.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZFunctionChain.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -89,6 +89,9 @@
theHead = this;
}
+ virtual ~ZFunctionChain_T()
+ {}
+
virtual bool Invoke(Result& oResult, Param iParam)
{ return false; }
Modified: trunk/zoolib/source/cxx/zoolib/ZML.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZML.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZML.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -896,8 +896,7 @@
ZQ<UTF32> theEntityCPQ;
const UTF8* current = localSource;
const UTF8* priorToEntity;
- while (not theEntityCPQ)
- {
+ do {
priorToEntity = current;
UTF32 theCP;
if (not ZUnicode::sReadInc(current, localSourceEnd, theCP))
@@ -928,7 +927,7 @@
theEntityCPQ = theCP;
}
}
- }
+ } while (not theEntityCPQ);
if (theEntityCPQ)
{
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -207,19 +207,18 @@
ZRef<ZNetEndpoint> ZNetListener_Local_Win::Listen()
{
- bool success = ::ConnectNamedPipe(fHANDLE, &fOVERLAPPED);
-
-// DWORD err = ::GetLastError();
-// if (!success && (err == ERROR_IO_PENDING || err == ERROR_PIPE_LISTENING))
-// ::WaitForSingleObjectEx(fEvent, INFINITE, TRUE);
-
- DWORD dummy;
- success = ::GetOverlappedResult(fHANDLE, &fOVERLAPPED, &dummy, TRUE);
-
- ZRef<HANDLE> theHANDLE;
- theHANDLE.swap(fHANDLE);
- fHANDLE = spCreateNamedPipe(fPath, false);
- return new ZNetEndpoint_Local_Win(theHANDLE);
+ if (::ConnectNamedPipe(fHANDLE, &fOVERLAPPED))
+ {
+ DWORD dummy;
+ if (::GetOverlappedResult(fHANDLE, &fOVERLAPPED, &dummy, TRUE))
+ {
+ ZRef<HANDLE> theHANDLE;
+ theHANDLE.swap(fHANDLE);
+ fHANDLE = spCreateNamedPipe(fPath, false);
+ return new ZNetEndpoint_Local_Win(theHANDLE);
+ }
+ }
+ return null;
}
void ZNetListener_Local_Win::CancelListen()
Modified: trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -316,30 +316,33 @@
void ZNetEndpoint_Socket::Imp_Read(void* oDest, size_t iCount, size_t* oCountRead)
{
char* localDest = static_cast<char*>(oDest);
- while (iCount)
+ if (iCount)
{
- const int result = sReceive(fSocketFD, localDest, iCount);
+ for (;;)
+ {
+ const int result = sReceive(fSocketFD, localDest, iCount);
- if (result < 0)
- {
- const int err = errno;
- if (err == EAGAIN)
- sWaitReadable(fSocketFD, 1000);
- else if (err != EINTR)
+ if (result < 0)
+ {
+ const int err = errno;
+ if (err == EAGAIN)
+ sWaitReadable(fSocketFD, 1000);
+ else if (err != EINTR)
+ break;
+ }
+ else if (result == 0)
+ {
+ // result is zero, indicating that the other end has sent FIN.
break;
+ }
+ else
+ {
+ localDest += result;
+ break;
+ }
}
- else if (result == 0)
- {
- // result is zero, indicating that the other end has sent FIN.
- break;
- }
- else
- {
- localDest += result;
- iCount -= result;
- break;
- }
}
+
if (oCountRead)
*oCountRead = localDest - static_cast<char*>(oDest);
}
Modified: trunk/zoolib/source/cxx/zoolib/ZPromise.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZPromise.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZPromise.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -211,7 +211,7 @@
{ return new ZPromise<T>; }
// =================================================================================================
-// MARK: - sGetClear
+// MARK: - sGetDeliveryClearPromise
template <class T>
ZRef<ZDelivery<T> > sGetDeliveryClearPromise(ZRef<ZPromise<T> >& ioPromise)
Modified: trunk/zoolib/source/cxx/zoolib/ZRef.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZRef.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZRef.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -206,18 +206,15 @@
return true;
}
- static T* sCFRetain(T* iP)
+ static T* sCFAllocatorRetain(T* iP)
{
if (iP)
sRetain(*iP);
return iP;
}
- static void sCFRelease(T* iP)
- {
- if (iP)
- sRelease(*iP);
- }
+ static void sCFAllocatorRelease(T* iP)
+ { spRelease(iP); }
private:
T* fP;
@@ -402,18 +399,16 @@
return true;
}
- static T* sCFRetain(T* iP)
+ static T* sCFAllocatorRetain(T* iP)
{
if (iP)
sRetain_T(iP);
return iP;
}
- static T* sCFRelease(T* iP)
- {
- if (iP)
- sRelease_T(iP);
- }
+ static void sCFAllocatorRelease(T* iP)
+ { spRelease(iP); }
+
private:
T* fP;
};
Modified: trunk/zoolib/source/cxx/zoolib/ZSafeSet.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZSafeSet.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZSafeSet.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -126,7 +126,7 @@
return fList.size();
}
- bool pEmpty() const
+ bool pIsEmpty() const
{
ZAcqMtx acq(fMtx);
return fList.empty();
@@ -247,8 +247,8 @@
size_t Size() const
{ return fRep->pSize(); }
- bool Empty() const
- { return fRep->pEmpty(); }
+ bool IsEmpty() const
+ { return fRep->pIsEmpty(); }
bool Insert(const T& iT)
{ return fRep->pInsert(iT); }
Modified: trunk/zoolib/source/cxx/zoolib/ZStream.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZStream.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -96,7 +96,7 @@
ZStreamR reference, you must work with some derived class.
*/ //@{
ZStreamR() {}
- ~ZStreamR() {}
+ virtual ~ZStreamR() {}
ZStreamR(const ZStreamR&) {}
ZStreamR& operator=(const ZStreamR&) { return *this; }
//@}
@@ -356,7 +356,7 @@
ZStreamW reference, you must work with some derived class.
*/ //@{
ZStreamW() {}
- ~ZStreamW() {}
+ virtual ~ZStreamW() {}
ZStreamW(const ZStreamW&) {}
ZStreamW& operator=(const ZStreamW&) { return *this; }
//@}
Modified: trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZStreamRW_FIFO.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -57,24 +57,26 @@
ZAcqMtx acq(fMutex);
++fUserCount;
uint8* localDest = static_cast<uint8*>(oDest);
- while (iCount)
+ if (iCount)
{
- const size_t countToCopy = min(iCount, fBuffer.size());
- if (countToCopy == 0)
+ for (;;)
{
- if (fClosed)
+ const size_t countToCopy = min(iCount, fBuffer.size());
+ if (countToCopy == 0)
+ {
+ if (fClosed)
+ break;
+ fCondition_Read.Wait(fMutex);
+ }
+ else
+ {
+ copy(fBuffer.begin(), fBuffer.begin() + countToCopy, localDest);
+ fBuffer.erase(fBuffer.begin(), fBuffer.begin() + countToCopy);
+ localDest += countToCopy;
+ fCondition_Write.Broadcast();
break;
- fCondition_Read.Wait(fMutex);
+ }
}
- else
- {
- copy(fBuffer.begin(), fBuffer.begin() + countToCopy, localDest);
- fBuffer.erase(fBuffer.begin(), fBuffer.begin() + countToCopy);
- localDest += countToCopy;
- iCount -= countToCopy;
- fCondition_Write.Broadcast();
- break;
- }
}
if (oCountRead)
*oCountRead = localDest - static_cast<uint8*>(oDest);
Modified: trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZStream_CRLF.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -248,10 +248,7 @@
size_t countWritten;
fStreamSink.Write(localSource, innerSource - localSource, &countWritten);
if (countWritten == 0)
- {
- countRemaining = 0;
break;
- }
if (oCountWritten)
*oCountWritten += countWritten;
countRemaining -= countWritten;
Modified: trunk/zoolib/source/cxx/zoolib/ZStrim.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStrim.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZStrim.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -63,7 +63,7 @@
ZStrimR reference, you must work with some derived class.
*/ //@{
ZStrimR() {}
- ~ZStrimR() {}
+ virtual ~ZStrimR() {}
ZStrimR(const ZStrimR&) {}
ZStrimR& operator=(const ZStrimR&) { return *this; }
//@}
@@ -196,7 +196,7 @@
ZStrimW reference, you must work with some derived class.
*/ //@{
ZStrimW() {}
- ~ZStrimW() {}
+ virtual ~ZStrimW() {}
ZStrimW(const ZStrimW&) {}
ZStrimW& operator=(const ZStrimW&) { return *this; }
//@}
Modified: trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZStrim_CRLF.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -161,10 +161,7 @@
size_t countWritten;
fStrimSink.Write(localSource, innerSource - localSource, &countWritten);
if (countWritten == 0)
- {
- iCountCU = 0;
break;
- }
iCountCU -= countWritten;
localSource += countWritten;
fLastWasCR = false;
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -175,40 +175,4 @@
return 0.0;
}
-ZQ<double> sQCoerceReal(const ZAny& iAny)
- {
- if (false)
- {}
- else if (const float* theVal = iAny.PGet<float>())
- return *theVal;
- else if (const double* theVal = iAny.PGet<double>())
- return *theVal;
-
- return null;
- }
-
-bool sQCoerceReal(const ZAny& iAny, double& oVal)
- {
- if (ZQ<double> qDouble = sQCoerceReal(iAny))
- {
- oVal = qDouble.Get();
- return true;
- }
- return false;
- }
-
-double sDCoerceReal(double iDefault, const ZAny& iAny)
- {
- if (ZQ<double> qDouble = sQCoerceReal(iAny))
- return qDouble.Get();
- return iDefault;
- }
-
-double sCoerceReal(const ZAny& iAny)
- {
- if (ZQ<double> qDouble = sQCoerceReal(iAny))
- return qDouble.Get();
- return 0.0;
- }
-
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -46,11 +46,18 @@
double sCoerceRat(const ZAny& iAny);
// Old names
-ZQ<double> sQCoerceReal(const ZAny& iAny);
-bool sQCoerceReal(const ZAny& iAny, double& oVal);
-double sDCoerceReal(double iDefault, const ZAny& iAny);
-double sCoerceReal(const ZAny& iAny);
+inline ZQ<double> sQCoerceReal(const ZAny& iAny)
+ { return sQCoerceRat(iAny); }
+inline bool sQCoerceReal(const ZAny& iAny, double& oVal)
+ { return sQCoerceRat(iAny, oVal); }
+
+inline double sDCoerceReal(double iDefault, const ZAny& iAny)
+ { return sDCoerceRat(iDefault, iAny); }
+
+inline double sCoerceReal(const ZAny& iAny)
+ { return sCoerceRat(iAny); }
+
} // namespace ZooLib
#endif // __ZUtil_Any_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_CF_Context.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_CF_Context.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_CF_Context.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -72,8 +72,8 @@
: fT(T())
{
fT.info = iRef.Get();
- fT.retain = (CFAllocatorRetainCallBack)&ZRef<O>::sCFRetain;
- fT.release = (CFAllocatorReleaseCallBack)&ZRef<O>::sCFRelease;
+ fT.retain = (CFAllocatorRetainCallBack)&ZRef<O>::sCFAllocatorRetain;
+ fT.release = (CFAllocatorReleaseCallBack)&ZRef<O>::sCFAllocatorRelease;
fT.retain(fT.info);
}
Modified: trunk/zoolib/source/cxx/zoolib/ZVisitor.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVisitor.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZVisitor.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -31,6 +31,9 @@
// =================================================================================================
// MARK: - ZVisitor
+ZVisitor::~ZVisitor()
+ {}
+
void ZVisitor::Visit(const ZRef<ZVisitee>& iRep)
{}
Modified: trunk/zoolib/source/cxx/zoolib/ZVisitor.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVisitor.h 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZVisitor.h 2012-01-25 19:28:33 UTC (rev 2683)
@@ -44,6 +44,7 @@
class ZVisitor
{
public:
+ virtual ~ZVisitor();
virtual void Visit(const ZRef<ZVisitee>& iRep);
};
Modified: trunk/zoolib/source/cxx/zoolib/ZWorker.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZWorker.cpp 2012-01-25 19:26:51 UTC (rev 2682)
+++ trunk/zoolib/source/cxx/zoolib/ZWorker.cpp 2012-01-25 19:28:33 UTC (rev 2683)
@@ -160,7 +160,7 @@
bool ZWorker::Attach(ZRef<ZCaller> iCaller)
{
ZGuardRMtx guard(fMtx);
- if (!fCaller)
+ if (not fCaller)
{
fCaller = iCaller;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-26 17:23:51
|
Revision: 2690
http://zoolib.svn.sourceforge.net/zoolib/?rev=2690&view=rev
Author: agreen
Date: 2012-01-26 17:23:43 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Conform to ZVisitee::Accept change.
Remove CoerceReal.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h
trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -131,7 +131,7 @@
virtual void Finalize();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
@@ -172,9 +172,9 @@
void Source_Union::Proxy::Finalize()
{ fSource->pFinalizeProxy(this); }
-void Source_Union::Proxy::Accept(ZVisitor& iVisitor)
+void Source_Union::Proxy::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Proxy* theVisitor = dynamic_cast<Visitor_Proxy*>(&iVisitor))
+ if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy*>(&iVisitor))
this->Accept_Proxy(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -182,7 +182,7 @@
void Source_Union::Proxy::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
- if (Visitor_Proxy* theVisitor = dynamic_cast<Visitor_Proxy*>(&iVisitor))
+ if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy*>(&iVisitor))
this->Accept_Proxy(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/javascriptcore/ZJavaScriptCore.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -299,7 +299,7 @@
{
return Value(double(theQ.Get()));
}
- else if (ZQ<double> theQ = sQCoerceReal(iAny))
+ else if (ZQ<double> theQ = sQCoerceRat(iAny))
{
return Value(theQ.Get());
}
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestFactory.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -66,7 +66,7 @@
#if ZCONFIG_SPI_Enabled(Win)
template <typename P>
-P sLookup_T(HMODULE iHMODULE, const char* iName)
+P spLookup(HMODULE iHMODULE, const char* iName)
{ return reinterpret_cast<P>(::GetProcAddress(iHMODULE, iName)); }
static ZQ<int> spQGetMajorVersion(const UTF16* iNativePath)
@@ -109,17 +109,14 @@
return nullptr;
}
-static void* spLookup(NSModule iModule, const char* iName)
+template <typename P>
+P spLookup(NSModule iNSModule, const char* iName)
{
- if (NSSymbol theSymbol = ::NSLookupSymbolInModule(iModule, iName))
- return ::NSAddressOfSymbol(theSymbol);
+ if (NSSymbol theSymbol = ::NSLookupSymbolInModule(iNSModule, iName))
+ return reinterpret_cast<P>(::NSAddressOfSymbol(theSymbol));
return nullptr;
}
-template <typename P>
-P sLookup_T(NSModule iNSModule, const char* iName)
- { return reinterpret_cast<P>(spLookup(iNSModule, iName)); }
-
#endif // ZCONFIG_SPI_Enabled(CoreFoundation) && __MACH__
// =================================================================================================
@@ -128,7 +125,7 @@
#if ZCONFIG_SPI_Enabled(CoreFoundation)
template <typename P>
-P sLookup_T(CFBundleRef iBundleRef, CFStringRef iName)
+P spLookup(CFBundleRef iBundleRef, CFStringRef iName)
{ return reinterpret_cast<P>(::CFBundleGetFunctionPointerForName(iBundleRef, iName)); }
ZQ<int> spQGetMajorVersion(const ZRef<CFStringRef>& iStringRef)
@@ -193,14 +190,14 @@
ZMemZero_T(fNPPluginFuncs);
fNPPluginFuncs.size = sizeof(NPPluginFuncs);
- fShutdown = sLookup_T<NPP_ShutdownProcPtr>(fHMODULE, "NP_Shutdown");
+ fShutdown = spLookup<NPP_ShutdownProcPtr>(fHMODULE, "NP_Shutdown");
NP_InitializeFuncPtr theInit =
- sLookup_T<NP_InitializeFuncPtr>
+ spLookup<NP_InitializeFuncPtr>
(fHMODULE, "NP_Initialize");
NP_GetEntryPointsFuncPtr theEntryPoints =
- sLookup_T<NP_GetEntryPointsFuncPtr>
+ spLookup<NP_GetEntryPointsFuncPtr>
(fHMODULE, "NP_GetEntryPoints");
if (!fShutdown || !theInit || !theEntryPoints)
@@ -210,7 +207,7 @@
theEntryPoints(&fNPPluginFuncs);
if (Flash_DisableLocalSecurityFuncPtr theDLS =
- sLookup_T<Flash_DisableLocalSecurityFuncPtr>(fHMODULE, "Flash_DisableLocalSecurity"))
+ spLookup<Flash_DisableLocalSecurityFuncPtr>(fHMODULE, "Flash_DisableLocalSecurity"))
{
theDLS();
}
@@ -296,24 +293,22 @@
// don't do this, and unload the bundle, then any subsequent loader will
// get nils for any entry point. In Safari this manifests with a
// "Internal error unloading bundle" log message.
- bool isMachOPlugin = ::CFBundleGetFunctionPointerForName(theBundleRef, CFSTR("NP_Initialize"));
-
// This also tells us that the NP_Initialize entry point exists, so it's
// a macho binary (CFM would only provide 'main'), and we should use NSModule
// to load our independent instantiation.
- if (isMachOPlugin)
+ if (::CFBundleGetFunctionPointerForName(theBundleRef, CFSTR("NP_Initialize")))
{
fNSModule = spLoadNSModule(theBundleRef);
- fShutdown = sLookup_T<NPP_ShutdownProcPtr>(fNSModule, "_NP_Shutdown");
+ fShutdown = spLookup<NPP_ShutdownProcPtr>(fNSModule, "_NP_Shutdown");
NP_GetEntryPointsFuncPtr theEntryPoints =
- sLookup_T<NP_GetEntryPointsFuncPtr>
+ spLookup<NP_GetEntryPointsFuncPtr>
(fNSModule, "_NP_GetEntryPoints");
NP_InitializeFuncPtr theInit =
- sLookup_T<NP_InitializeFuncPtr>
+ spLookup<NP_InitializeFuncPtr>
(fNSModule, "_NP_Initialize");
if (!fShutdown || !theInit || !theEntryPoints)
@@ -350,7 +345,7 @@
// lookup mechanism will have created a MachO-callable thunk for it.
MainFuncPtr theMain =
- sLookup_T<MainFuncPtr>
+ spLookup<MainFuncPtr>
(theBundleRef, CFSTR("main"));
if (!theMain)
@@ -441,7 +436,7 @@
CFBundleRef theBundleRef = ::CFPlugInGetBundle(fPlugInRef);
// We're PowerPC -- look for main(), and if it's there we can just call it.
- MainFuncPtr theMain = sLookup_T<MainFuncPtr>(theBundleRef, CFSTR("main"));
+ MainFuncPtr theMain = spLookup<MainFuncPtr>(theBundleRef, CFSTR("main"));
if (theMain)
{
@@ -456,14 +451,14 @@
(fNPNF.size - offsetof(NPNetscapeFuncs_Z, geturl)) / sizeof(void*),
fGlue_NPNF);
- fShutdown = sLookup_T<NPP_ShutdownProcPtr>(theBundleRef, CFSTR("NP_Shutdown"));
+ fShutdown = spLookup<NPP_ShutdownProcPtr>(theBundleRef, CFSTR("NP_Shutdown"));
NP_GetEntryPointsFuncPtr theEntryPoints =
- sLookup_T<NP_GetEntryPointsFuncPtr>
+ spLookup<NP_GetEntryPointsFuncPtr>
(theBundleRef, CFSTR("NP_GetEntryPoints"));
NP_InitializeFuncPtr theInit =
- sLookup_T<NP_InitializeFuncPtr>
+ spLookup<NP_InitializeFuncPtr>
(theBundleRef, CFSTR("NP_Initialize"));
if (!fShutdown || !theInit || !theEntryPoints)
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -47,20 +47,22 @@
, fExpr_Bool(iExpr_Bool)
{}
-void Expr_Rel_Search::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Search::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Search* theVisitor = dynamic_cast<Visitor_Expr_Rel_Search*>(&iVisitor))
- this->Accept_Expr_Rel_Search(*theVisitor);
+ if (Visitor_Expr_Rel_Search* theVisitor =
+ DynNonConst<Visitor_Expr_Rel_Search*>(&iVisitor))
+ { this->Accept_Expr_Rel_Search(*theVisitor); }
else
- inherited::Accept(iVisitor);
+ { inherited::Accept(iVisitor); }
}
void Expr_Rel_Search::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Search* theVisitor = dynamic_cast<Visitor_Expr_Rel_Search*>(&iVisitor))
- this->Accept_Expr_Rel_Search(*theVisitor);
+ if (Visitor_Expr_Rel_Search* theVisitor =
+ DynNonConst<Visitor_Expr_Rel_Search*>(&iVisitor))
+ { this->Accept_Expr_Rel_Search(*theVisitor); }
else
- inherited::Accept_Expr_Op0(iVisitor);
+ { inherited::Accept_Expr_Op0(iVisitor); }
}
ZRef<ZRA::Expr_Rel> Expr_Rel_Search::Self()
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -42,7 +42,7 @@
Expr_Rel_Search(const ZRA::Rename& iRename, const ZRef<ZExpr_Bool>& iExpr_Bool);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -64,9 +64,9 @@
Expr_Rel_Calc::~Expr_Rel_Calc()
{}
-void Expr_Rel_Calc::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Calc::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Calc* theVisitor = dynamic_cast<Visitor_Expr_Rel_Calc*>(&iVisitor))
+ if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc*>(&iVisitor))
this->Accept_Expr_Rel_Calc(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -74,7 +74,7 @@
void Expr_Rel_Calc::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Calc* theVisitor = dynamic_cast<Visitor_Expr_Rel_Calc*>(&iVisitor))
+ if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc*>(&iVisitor))
this->Accept_Expr_Rel_Calc(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -52,7 +52,7 @@
virtual ~Expr_Rel_Calc();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -41,9 +41,9 @@
: fRelHead(iRelHead)
{}
-void Expr_Rel_Concrete::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Concrete::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Concrete* theVisitor = dynamic_cast<Visitor_Expr_Rel_Concrete*>(&iVisitor))
+ if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete*>(&iVisitor))
this->Accept_Expr_Rel_Concrete(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -51,7 +51,7 @@
void Expr_Rel_Concrete::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Concrete* theVisitor = dynamic_cast<Visitor_Expr_Rel_Concrete*>(&iVisitor))
+ if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete*>(&iVisitor))
this->Accept_Expr_Rel_Concrete(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -44,7 +44,7 @@
Expr_Rel_Concrete(const RelHead& iRelHead);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -50,9 +50,9 @@
Expr_Rel_Const::~Expr_Rel_Const()
{}
-void Expr_Rel_Const::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Const::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Const* theVisitor = dynamic_cast<Visitor_Expr_Rel_Const*>(&iVisitor))
+ if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const*>(&iVisitor))
this->Accept_Expr_Rel_Const(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Const::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Const* theVisitor = dynamic_cast<Visitor_Expr_Rel_Const*>(&iVisitor))
+ if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const*>(&iVisitor))
this->Accept_Expr_Rel_Const(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -45,7 +45,7 @@
virtual ~Expr_Rel_Const();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -43,9 +43,9 @@
Expr_Rel_Dee::~Expr_Rel_Dee()
{}
-void Expr_Rel_Dee::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Dee::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Dee* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dee*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee*>(&iVisitor))
this->Accept_Expr_Rel_Dee(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -53,7 +53,7 @@
void Expr_Rel_Dee::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Dee* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dee*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee*>(&iVisitor))
this->Accept_Expr_Rel_Dee(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -46,7 +46,7 @@
virtual ~Expr_Rel_Dee();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -49,7 +49,7 @@
void Expr_Rel_Difference::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
if (Visitor_Expr_Rel_Difference* theVisitor =
- dynamic_cast<Visitor_Expr_Rel_Difference*>(&iVisitor))
+ DynNonConst<Visitor_Expr_Rel_Difference*>(&iVisitor))
{
this->Accept_Expr_Rel_Difference(*theVisitor);
}
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -43,9 +43,9 @@
Expr_Rel_Dum::~Expr_Rel_Dum()
{}
-void Expr_Rel_Dum::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Dum::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Dum* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dum*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum*>(&iVisitor))
this->Accept_Expr_Rel_Dum(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -53,7 +53,7 @@
void Expr_Rel_Dum::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Dum* theVisitor = dynamic_cast<Visitor_Expr_Rel_Dum*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum*>(&iVisitor))
this->Accept_Expr_Rel_Dum(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -46,7 +46,7 @@
virtual ~Expr_Rel_Dum();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T<Expr_Rel>
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -52,9 +52,9 @@
, fRelName(iRelName)
{}
-void Expr_Rel_Embed::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Embed::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Embed* theVisitor = dynamic_cast<Visitor_Expr_Rel_Embed*>(&iVisitor))
+ if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed*>(&iVisitor))
this->Accept_Expr_Rel_Embed(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -62,7 +62,7 @@
void Expr_Rel_Embed::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Embed* theVisitor = dynamic_cast<Visitor_Expr_Rel_Embed*>(&iVisitor))
+ if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed*>(&iVisitor))
this->Accept_Expr_Rel_Embed(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -43,7 +43,7 @@
const RelName& iRelName, const ZRef<Expr_Rel>& iEmbedee);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -46,9 +46,9 @@
: inherited(iOp0, iOp1)
{}
-void Expr_Rel_Product::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Product::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Product* theVisitor = dynamic_cast<Visitor_Expr_Rel_Product*>(&iVisitor))
+ if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product*>(&iVisitor))
this->Accept_Expr_Rel_Product(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -56,7 +56,7 @@
void Expr_Rel_Product::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Product* theVisitor = dynamic_cast<Visitor_Expr_Rel_Product*>(&iVisitor))
+ if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product*>(&iVisitor))
this->Accept_Expr_Rel_Product(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -42,7 +42,7 @@
Expr_Rel_Product(const ZRef<Expr_Rel>& iOp0, const ZRef<Expr_Rel>& iOp1);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -50,9 +50,9 @@
Expr_Rel_Project::~Expr_Rel_Project()
{}
-void Expr_Rel_Project::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Project::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Project* theVisitor = dynamic_cast<Visitor_Expr_Rel_Project*>(&iVisitor))
+ if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project*>(&iVisitor))
this->Accept_Expr_Rel_Project(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Project::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Project* theVisitor = dynamic_cast<Visitor_Expr_Rel_Project*>(&iVisitor))
+ if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project*>(&iVisitor))
this->Accept_Expr_Rel_Project(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -44,7 +44,7 @@
virtual ~Expr_Rel_Project();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -59,9 +59,9 @@
Expr_Rel_Rename::~Expr_Rel_Rename()
{}
-void Expr_Rel_Rename::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Rename::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Rename* theVisitor = dynamic_cast<Visitor_Expr_Rel_Rename*>(&iVisitor))
+ if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename*>(&iVisitor))
this->Accept_Expr_Rel_Rename(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -69,7 +69,7 @@
void Expr_Rel_Rename::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Rename* theVisitor = dynamic_cast<Visitor_Expr_Rel_Rename*>(&iVisitor))
+ if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename*>(&iVisitor))
this->Accept_Expr_Rel_Rename(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -45,7 +45,7 @@
virtual ~Expr_Rel_Rename();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -50,9 +50,9 @@
Expr_Rel_Restrict::~Expr_Rel_Restrict()
{}
-void Expr_Rel_Restrict::Accept(ZVisitor& iVisitor)
+void Expr_Rel_Restrict::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor = dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
+ if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict*>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Restrict::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor = dynamic_cast<Visitor_Expr_Rel_Restrict*>(&iVisitor))
+ if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict*>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -44,7 +44,7 @@
virtual ~Expr_Rel_Restrict();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T<Expr_Rel>
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -48,7 +48,7 @@
void Expr_Rel_Union::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Union* theVisitor = dynamic_cast<Visitor_Expr_Rel_Union*>(&iVisitor))
+ if (Visitor_Expr_Rel_Union* theVisitor = DynNonConst<Visitor_Expr_Rel_Union*>(&iVisitor))
this->Accept_Expr_Rel_Union(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZDCPixmap_CoreVideo.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -54,7 +54,8 @@
fBaseAddress = nullptr;
}
-EFormatStandard sAsFormatStandard(OSType iOSType)
+static
+EFormatStandard spAsFormatStandard(OSType iOSType)
{
switch (iOSType)
{
@@ -81,7 +82,7 @@
ZDCPixmap sPixmap(ZRef<CVPixelBufferRef> iPBR)
{
const OSType thePFT = ::CVPixelBufferGetPixelFormatType(iPBR);
- const EFormatStandard theFormat = sAsFormatStandard(thePFT);
+ const EFormatStandard theFormat = spAsFormatStandard(thePFT);
const size_t theRowBytes = ::CVPixelBufferGetBytesPerRow(iPBR);
const size_t theHeight = ::CVPixelBufferGetHeight(iPBR);
Modified: trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDebug.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZDebug.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -24,6 +24,7 @@
#include "zoolib/ZCONFIG_SPI.h"
#include <stdio.h>
+#include <stdlib.h> // For abort
#include <string.h>
#if ZCONFIG(Compiler, MSVC)
@@ -287,6 +288,9 @@
// Perhaps it should throw an exception in production code.
void ZUnimplemented()
- { ZDebugStopf(0, ("Unimplemented routine")); }
+ {
+ ZDebugStopf(0, ("Unimplemented routine"));
+ abort();
+ }
} // namespace ZooLib
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -41,9 +41,9 @@
return spTrue;
}
-void ZExpr_Bool_True::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_True::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True*>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -51,7 +51,7 @@
void ZExpr_Bool_True::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True*>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
@@ -90,9 +90,9 @@
return spFalse;
}
-void ZExpr_Bool_False::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_False::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False*>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -100,7 +100,7 @@
void ZExpr_Bool_False::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False*>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
@@ -134,9 +134,9 @@
: inherited(iOp0)
{}
-void ZExpr_Bool_Not::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_Not::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not*>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -144,7 +144,7 @@
void ZExpr_Bool_Not::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not*>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
@@ -178,9 +178,9 @@
: inherited(iOp0, iOp1)
{}
-void ZExpr_Bool_And::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_And::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And*>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -188,7 +188,7 @@
void ZExpr_Bool_And::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And*>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
@@ -226,9 +226,9 @@
: inherited(iOp0, iOp1)
{}
-void ZExpr_Bool_Or::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_Or::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or*>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -236,7 +236,7 @@
void ZExpr_Bool_Or::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor = dynamic_cast<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or*>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -53,7 +53,7 @@
static ZRef<ZExpr_Bool> sTrue();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
@@ -96,7 +96,7 @@
static ZRef<ZExpr_Bool> sFalse();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0_T
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
@@ -135,7 +135,7 @@
ZExpr_Bool_Not(const ZRef<ZExpr_Bool>& iOp0);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op1_T
virtual void Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor);
@@ -174,7 +174,7 @@
ZExpr_Bool_And(const ZRef<ZExpr_Bool>& iOp0, const ZRef<ZExpr_Bool>& iOp1);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor);
@@ -213,7 +213,7 @@
ZExpr_Bool_Or(const ZRef<ZExpr_Bool>& iOp0, const ZRef<ZExpr_Bool>& iOp1);
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op2_T
virtual void Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -33,30 +33,22 @@
ZExpr_Bool_ValPred::~ZExpr_Bool_ValPred()
{}
-void ZExpr_Bool_ValPred::Accept(ZVisitor& iVisitor)
+void ZExpr_Bool_ValPred::Accept(const ZVisitor& iVisitor)
{
if (ZVisitor_Expr_Bool_ValPred* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
- {
- this->Accept_Expr_Bool_ValPred(*theVisitor);
- }
+ DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
+ { this->Accept_Expr_Bool_ValPred(*theVisitor); }
else
- {
- inherited::Accept(iVisitor);
- }
+ { inherited::Accept(iVisitor); }
}
void ZExpr_Bool_ValPred::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
if (ZVisitor_Expr_Bool_ValPred* theVisitor =
- dynamic_cast<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
- {
- this->Accept_Expr_Bool_ValPred(*theVisitor);
- }
+ DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
+ { this->Accept_Expr_Bool_ValPred(*theVisitor); }
else
- {
- inherited::Accept_Expr_Op0(iVisitor);
- }
+ { inherited::Accept_Expr_Op0(iVisitor); }
}
ZRef<ZExpr_Bool> ZExpr_Bool_ValPred::Self()
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -42,7 +42,7 @@
virtual ~ZExpr_Bool_ValPred();
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor);
+ virtual void Accept(const ZVisitor& iVisitor);
// From ZExpr_Op0
virtual void Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -47,9 +47,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
this->Accept_Expr_Op0(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -58,10 +58,14 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ {
this->Accept_Expr_Op0(*theVisitor);
+ }
else
+ {
ZExpr::Accept_Expr(iVisitor);
+ }
}
// Our protocol
@@ -108,9 +112,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -119,7 +123,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
@@ -180,9 +184,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -191,7 +195,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
@@ -255,9 +259,9 @@
{}
// From ZVisitee
- virtual void Accept(ZVisitor& iVisitor)
+ virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_OpN_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
this->Accept_Expr_OpN(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -266,7 +270,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_OpN_T<T>* theVisitor = dynamic_cast<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
this->Accept_Expr_OpN(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Any.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -33,22 +33,22 @@
if (const bool* pBool = iAny.PGet<bool>())
return *pBool;
- if (ZQ<int64> qInt64 = sQCoerceInt(iAny))
- return (0 != qInt64.Get());
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
+ return *theQ;
- if (ZQ<double> qDouble = sQCoerceReal(iAny))
- return (0.0 != qDouble.Get());
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
+ return *theQ;
if (const string* pString = iAny.PGet<string>())
{
if (pString->empty())
return false;
- if (ZQ<double> qDouble = ZUtil_string::sQDouble(*pString))
- return (0.0 != qDouble.Get());
+ if (ZQ<double> theQ = ZUtil_string::sQDouble(*pString))
+ return *theQ;
- if (ZQ<int64> qInt64 = ZUtil_string::sQInt64(*pString))
- return (0 != qInt64.Get());
+ if (ZQ<int64> theQ = ZUtil_string::sQInt64(*pString))
+ return *theQ;
if (ZUtil_string::sEquali(*pString, "t") || ZUtil_string::sEquali(*pString, "true"))
return true;
@@ -61,9 +61,9 @@
bool sQCoerceBool(const ZAny& iAny, bool& oVal)
{
- if (ZQ<bool> qBool = sQCoerceBool(iAny))
+ if (ZQ<bool> theQ = sQCoerceBool(iAny))
{
- oVal = qBool.Get();
+ oVal = *theQ;
return true;
}
return false;
@@ -71,15 +71,15 @@
bool sDCoerceBool(bool iDefault, const ZAny& iAny)
{
- if (ZQ<bool> qBool = sQCoerceBool(iAny))
- return qBool.Get();
+ if (ZQ<bool> theQ = sQCoerceBool(iAny))
+ return *theQ;
return iDefault;
}
bool sCoerceBool(const ZAny& iAny)
{
- if (ZQ<bool> qBool = sQCoerceBool(iAny))
- return qBool.Get();
+ if (ZQ<bool> theQ = sQCoerceBool(iAny))
+ return *theQ;
return false;
}
@@ -87,39 +87,39 @@
{
if (false)
{}
- else if (const char* theVal = iAny.PGet<char>())
- return *theVal;
- else if (const signed char* theVal = iAny.PGet<signed char>())
- return *theVal;
- else if (const unsigned char* theVal = iAny.PGet<unsigned char>())
- return *theVal;
- else if (const wchar_t* theVal = iAny.PGet<wchar_t>())
- return *theVal;
- else if (const short* theVal = iAny.PGet<short>())
- return *theVal;
- else if (const unsigned short* theVal = iAny.PGet<unsigned short>())
- return *theVal;
- else if (const int* theVal = iAny.PGet<int>())
- return *theVal;
- else if (const unsigned int* theVal = iAny.PGet<unsigned int>())
- return *theVal;
- else if (const long* theVal = iAny.PGet<long>())
- return *theVal;
- else if (const unsigned long* theVal = iAny.PGet<unsigned long>())
- return *theVal;
- else if (const int64* theVal = iAny.PGet<int64>())
- return *theVal;
- else if (const uint64* theVal = iAny.PGet<uint64>())
- return *theVal;
+ else if (const char* theP = iAny.PGet<char>())
+ return *theP;
+ else if (const signed char* theP = iAny.PGet<signed char>())
+ return *theP;
+ else if (const unsigned char* theP = iAny.PGet<unsigned char>())
+ return *theP;
+ else if (const wchar_t* theP = iAny.PGet<wchar_t>())
+ return *theP;
+ else if (const short* theP = iAny.PGet<short>())
+ return *theP;
+ else if (const unsigned short* theP = iAny.PGet<unsigned short>())
+ return *theP;
+ else if (const int* theP = iAny.PGet<int>())
+ return *theP;
+ else if (const unsigned int* theP = iAny.PGet<unsigned int>())
+ return *theP;
+ else if (const long* theP = iAny.PGet<long>())
+ return *theP;
+ else if (const unsigned long* theP = iAny.PGet<unsigned long>())
+ return *theP;
+ else if (const int64* theP = iAny.PGet<int64>())
+ return *theP;
+ else if (const uint64* theP = iAny.PGet<uint64>())
+ return *theP;
return null;
}
bool sQCoerceInt(const ZAny& iAny, int64& oVal)
{
- if (ZQ<int64> qInt64 = sQCoerceInt(iAny))
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
{
- oVal = qInt64.Get();
+ oVal = *theQ;
return true;
}
return false;
@@ -127,15 +127,15 @@
int64 sDCoerceInt(int64 iDefault, const ZAny& iAny)
{
- if (ZQ<int64> qInt = sQCoerceInt(iAny))
- return qInt.Get();
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
+ return *theQ;
return iDefault;
}
int64 sCoerceInt(const ZAny& iAny)
{
- if (ZQ<int64> qInt = sQCoerceInt(iAny))
- return qInt.Get();
+ if (ZQ<int64> theQ = sQCoerceInt(iAny))
+ return *theQ;
return 0;
}
@@ -143,19 +143,19 @@
{
if (false)
{}
- else if (const float* theVal = iAny.PGet<float>())
- return *theVal;
- else if (const double* theVal = iAny.PGet<double>())
- return *theVal;
+ else if (const float* theP = iAny.PGet<float>())
+ return *theP;
+ else if (const double* theP = iAny.PGet<double>())
+ return *theP;
return null;
}
bool sQCoerceRat(const ZAny& iAny, double& oVal)
{
- if (ZQ<double> qDouble = sQCoerceRat(iAny))
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
{
- oVal = qDouble.Get();
+ oVal = *theQ;
return true;
}
return false;
@@ -163,15 +163,15 @@
double sDCoerceRat(double iDefault, const ZAny& iAny)
{
- if (ZQ<double> qDouble = sQCoerceRat(iAny))
- return qDouble.Get();
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
+ return *theQ;
return iDefault;
}
double sCoerceRat(const ZAny& iAny)
{
- if (ZQ<double> qDouble = sQCoerceRat(iAny))
- return qDouble.Get();
+ if (ZQ<double> theQ = sQCoerceRat(iAny))
+ return *theQ;
return 0.0;
}
Modified: trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZUtil_Any.h 2012-01-26 17:23:43 UTC (rev 2690)
@@ -45,19 +45,6 @@
double sDCoerceRat(double iDefault, const ZAny& iAny);
double sCoerceRat(const ZAny& iAny);
-// Old names
-inline ZQ<double> sQCoerceReal(const ZAny& iAny)
- { return sQCoerceRat(iAny); }
-
-inline bool sQCoerceReal(const ZAny& iAny, double& oVal)
- { return sQCoerceRat(iAny, oVal); }
-
-inline double sDCoerceReal(double iDefault, const ZAny& iAny)
- { return sDCoerceRat(iDefault, iAny); }
-
-inline double sCoerceReal(const ZAny& iAny)
- { return sCoerceRat(iAny); }
-
} // namespace ZooLib
#endif // __ZUtil_Any_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSON.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -922,10 +922,7 @@
ZRef<ZYadR> iYadR, const ZStrimW& s)
{
if (iYadR)
- {
- Visitor_Writer theWriter(iInitialIndent, iOptions, s);
- iYadR->Accept(theWriter);
- }
+ iYadR->Accept(Visitor_Writer(iInitialIndent, iOptions, s));
}
} // namespace ZYad_JSON
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_JSONNormalize.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -80,7 +80,7 @@
{
oVal = theQ.Get();
}
- else if (ZQ<double> theQ = sQCoerceReal(iVal))
+ else if (ZQ<double> theQ = sQCoerceRat(iVal))
{
oVal = theQ.Get();
}
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_XMLPList.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -375,7 +375,7 @@
s.Writef("%lld", asInt64);
s.End("integer");
}
- else if (sQCoerceReal(iVal, asDouble))
+ else if (sQCoerceRat(iVal, asDouble))
{
s.Begin("real");
ZUtil_Strim::sWriteExact(s, asDouble);
Modified: trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp 2012-01-26 17:22:14 UTC (rev 2689)
+++ trunk/zoolib/source/cxx/zoolib/ZYad_XMLRPC.cpp 2012-01-26 17:23:43 UTC (rev 2690)
@@ -592,7 +592,7 @@
s.Writef("%d", int(asInt64));
s.End("i4");
}
- else if (sQCoerceReal(iVal, asDouble))
+ else if (sQCoerceRat(iVal, asDouble))
{
s.Begin("double");
ZUtil_Strim::sWriteExact(s, asDouble);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-01-26 18:22:23
|
Revision: 2691
http://zoolib.svn.sourceforge.net/zoolib/?rev=2691&view=rev
Author: agreen
Date: 2012-01-26 18:22:12 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
More fiddling around with DynNonConst, conforming to ZRef::DynamicCast.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
trunk/zoolib/source/cxx/zoolib/ZYad.cpp
trunk/zoolib/source/cxx/zoolib/zconfigl.h
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_Union.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -174,7 +174,7 @@
void Source_Union::Proxy::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy*>(&iVisitor))
+ if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy>(&iVisitor))
this->Accept_Proxy(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -182,7 +182,7 @@
void Source_Union::Proxy::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
- if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy*>(&iVisitor))
+ if (Visitor_Proxy* theVisitor = DynNonConst<Visitor_Proxy>(&iVisitor))
this->Accept_Proxy(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zqe/ZQE_Expr_Rel_Search.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -49,20 +49,18 @@
void Expr_Rel_Search::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Search* theVisitor =
- DynNonConst<Visitor_Expr_Rel_Search*>(&iVisitor))
- { this->Accept_Expr_Rel_Search(*theVisitor); }
+ if (Visitor_Expr_Rel_Search* theVisitor = DynNonConst<Visitor_Expr_Rel_Search>(&iVisitor))
+ this->Accept_Expr_Rel_Search(*theVisitor);
else
- { inherited::Accept(iVisitor); }
+ inherited::Accept(iVisitor);
}
void Expr_Rel_Search::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZRA::Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Search* theVisitor =
- DynNonConst<Visitor_Expr_Rel_Search*>(&iVisitor))
- { this->Accept_Expr_Rel_Search(*theVisitor); }
+ if (Visitor_Expr_Rel_Search* theVisitor = DynNonConst<Visitor_Expr_Rel_Search>(&iVisitor))
+ this->Accept_Expr_Rel_Search(*theVisitor);
else
- { inherited::Accept_Expr_Op0(iVisitor); }
+ inherited::Accept_Expr_Op0(iVisitor);
}
ZRef<ZRA::Expr_Rel> Expr_Rel_Search::Self()
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Calc.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -66,7 +66,7 @@
void Expr_Rel_Calc::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc*>(&iVisitor))
+ if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc>(&iVisitor))
this->Accept_Expr_Rel_Calc(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -74,7 +74,7 @@
void Expr_Rel_Calc::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc*>(&iVisitor))
+ if (Visitor_Expr_Rel_Calc* theVisitor = DynNonConst<Visitor_Expr_Rel_Calc>(&iVisitor))
this->Accept_Expr_Rel_Calc(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Concrete.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -43,7 +43,7 @@
void Expr_Rel_Concrete::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete*>(&iVisitor))
+ if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete>(&iVisitor))
this->Accept_Expr_Rel_Concrete(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -51,7 +51,7 @@
void Expr_Rel_Concrete::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete*>(&iVisitor))
+ if (Visitor_Expr_Rel_Concrete* theVisitor = DynNonConst<Visitor_Expr_Rel_Concrete>(&iVisitor))
this->Accept_Expr_Rel_Concrete(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Const.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -52,7 +52,7 @@
void Expr_Rel_Const::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const*>(&iVisitor))
+ if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const>(&iVisitor))
this->Accept_Expr_Rel_Const(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Const::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const*>(&iVisitor))
+ if (Visitor_Expr_Rel_Const* theVisitor = DynNonConst<Visitor_Expr_Rel_Const>(&iVisitor))
this->Accept_Expr_Rel_Const(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dee.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -45,7 +45,7 @@
void Expr_Rel_Dee::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee>(&iVisitor))
this->Accept_Expr_Rel_Dee(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -53,7 +53,7 @@
void Expr_Rel_Dee::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dee* theVisitor = DynNonConst<Visitor_Expr_Rel_Dee>(&iVisitor))
this->Accept_Expr_Rel_Dee(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Difference.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -49,14 +49,10 @@
void Expr_Rel_Difference::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
if (Visitor_Expr_Rel_Difference* theVisitor =
- DynNonConst<Visitor_Expr_Rel_Difference*>(&iVisitor))
- {
- this->Accept_Expr_Rel_Difference(*theVisitor);
- }
+ DynNonConst<Visitor_Expr_Rel_Difference>(&iVisitor))
+ { this->Accept_Expr_Rel_Difference(*theVisitor); }
else
- {
- inherited::Accept_Expr_Op2(iVisitor);
- }
+ { inherited::Accept_Expr_Op2(iVisitor); }
}
ZRef<Expr_Rel> Expr_Rel_Difference::Self()
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Dum.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -45,7 +45,7 @@
void Expr_Rel_Dum::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum>(&iVisitor))
this->Accept_Expr_Rel_Dum(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -53,7 +53,7 @@
void Expr_Rel_Dum::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum*>(&iVisitor))
+ if (Visitor_Expr_Rel_Dum* theVisitor = DynNonConst<Visitor_Expr_Rel_Dum>(&iVisitor))
this->Accept_Expr_Rel_Dum(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Embed.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -54,7 +54,7 @@
void Expr_Rel_Embed::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed*>(&iVisitor))
+ if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed>(&iVisitor))
this->Accept_Expr_Rel_Embed(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -62,7 +62,7 @@
void Expr_Rel_Embed::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed*>(&iVisitor))
+ if (Visitor_Expr_Rel_Embed* theVisitor = DynNonConst<Visitor_Expr_Rel_Embed>(&iVisitor))
this->Accept_Expr_Rel_Embed(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Intersect.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -48,15 +48,10 @@
void Expr_Rel_Intersect::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Intersect* theVisitor =
- dynamic_cast<Visitor_Expr_Rel_Intersect*>(&iVisitor))
- {
+ if (Visitor_Expr_Rel_Intersect* theVisitor = DynNonConst<Visitor_Expr_Rel_Intersect>(&iVisitor))
this->Accept_Expr_Rel_Intersect(*theVisitor);
- }
else
- {
inherited::Accept_Expr_Op2(iVisitor);
- }
}
ZRef<Expr_Rel> Expr_Rel_Intersect::Self()
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Product.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -48,7 +48,7 @@
void Expr_Rel_Product::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product*>(&iVisitor))
+ if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product>(&iVisitor))
this->Accept_Expr_Rel_Product(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -56,7 +56,7 @@
void Expr_Rel_Product::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product*>(&iVisitor))
+ if (Visitor_Expr_Rel_Product* theVisitor = DynNonConst<Visitor_Expr_Rel_Product>(&iVisitor))
this->Accept_Expr_Rel_Product(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Project.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -52,7 +52,7 @@
void Expr_Rel_Project::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project*>(&iVisitor))
+ if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project>(&iVisitor))
this->Accept_Expr_Rel_Project(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Project::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project*>(&iVisitor))
+ if (Visitor_Expr_Rel_Project* theVisitor = DynNonConst<Visitor_Expr_Rel_Project>(&iVisitor))
this->Accept_Expr_Rel_Project(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Rename.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -61,7 +61,7 @@
void Expr_Rel_Rename::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename*>(&iVisitor))
+ if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename>(&iVisitor))
this->Accept_Expr_Rel_Rename(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -69,7 +69,7 @@
void Expr_Rel_Rename::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename*>(&iVisitor))
+ if (Visitor_Expr_Rel_Rename* theVisitor = DynNonConst<Visitor_Expr_Rel_Rename>(&iVisitor))
this->Accept_Expr_Rel_Rename(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Restrict.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -52,7 +52,7 @@
void Expr_Rel_Restrict::Accept(const ZVisitor& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict*>(&iVisitor))
+ if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -60,7 +60,7 @@
void Expr_Rel_Restrict::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict*>(&iVisitor))
+ if (Visitor_Expr_Rel_Restrict* theVisitor = DynNonConst<Visitor_Expr_Rel_Restrict>(&iVisitor))
this->Accept_Expr_Rel_Restrict(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
Modified: trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/more/zoolib/zra/ZRA_Expr_Rel_Union.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -48,7 +48,7 @@
void Expr_Rel_Union::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<Expr_Rel>& iVisitor)
{
- if (Visitor_Expr_Rel_Union* theVisitor = DynNonConst<Visitor_Expr_Rel_Union*>(&iVisitor))
+ if (Visitor_Expr_Rel_Union* theVisitor = DynNonConst<Visitor_Expr_Rel_Union>(&iVisitor))
this->Accept_Expr_Rel_Union(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -27,7 +27,7 @@
void ZExpr::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr* theVisitor = DynNonConst<ZVisitor_Expr*>(&iVisitor))
+ if (ZVisitor_Expr* theVisitor = DynNonConst<ZVisitor_Expr>(&iVisitor))
this->Accept_Expr(*theVisitor);
else
ZVisitee::Accept(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -43,7 +43,7 @@
void ZExpr_Bool_True::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -51,7 +51,7 @@
void ZExpr_Bool_True::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_True* theVisitor = DynNonConst<ZVisitor_Expr_Bool_True>(&iVisitor))
this->Accept_Expr_Bool_True(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
@@ -92,7 +92,7 @@
void ZExpr_Bool_False::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -100,7 +100,7 @@
void ZExpr_Bool_False::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_False* theVisitor = DynNonConst<ZVisitor_Expr_Bool_False>(&iVisitor))
this->Accept_Expr_Bool_False(*theVisitor);
else
inherited::Accept_Expr_Op0(iVisitor);
@@ -136,7 +136,7 @@
void ZExpr_Bool_Not::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -144,7 +144,7 @@
void ZExpr_Bool_Not::Accept_Expr_Op1(ZVisitor_Expr_Op1_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Not* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Not>(&iVisitor))
this->Accept_Expr_Bool_Not(*theVisitor);
else
inherited::Accept_Expr_Op1(iVisitor);
@@ -180,7 +180,7 @@
void ZExpr_Bool_And::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -188,7 +188,7 @@
void ZExpr_Bool_And::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_And* theVisitor = DynNonConst<ZVisitor_Expr_Bool_And>(&iVisitor))
this->Accept_Expr_Bool_And(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
@@ -228,7 +228,7 @@
void ZExpr_Bool_Or::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
else
inherited::Accept(iVisitor);
@@ -236,7 +236,7 @@
void ZExpr_Bool_Or::Accept_Expr_Op2(ZVisitor_Expr_Op2_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or*>(&iVisitor))
+ if (ZVisitor_Expr_Bool_Or* theVisitor = DynNonConst<ZVisitor_Expr_Bool_Or>(&iVisitor))
this->Accept_Expr_Bool_Or(*theVisitor);
else
inherited::Accept_Expr_Op2(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Bool_ValPred.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -35,20 +35,18 @@
void ZExpr_Bool_ValPred::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Bool_ValPred* theVisitor =
- DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
- { this->Accept_Expr_Bool_ValPred(*theVisitor); }
+ if (ZVisitor_Expr_Bool_ValPred* theVisitor = DynNonConst<ZVisitor_Expr_Bool_ValPred>(&iVisitor))
+ this->Accept_Expr_Bool_ValPred(*theVisitor);
else
- { inherited::Accept(iVisitor); }
+ inherited::Accept(iVisitor);
}
void ZExpr_Bool_ValPred::Accept_Expr_Op0(ZVisitor_Expr_Op0_T<ZExpr_Bool>& iVisitor)
{
- if (ZVisitor_Expr_Bool_ValPred* theVisitor =
- DynNonConst<ZVisitor_Expr_Bool_ValPred*>(&iVisitor))
- { this->Accept_Expr_Bool_ValPred(*theVisitor); }
+ if (ZVisitor_Expr_Bool_ValPred* theVisitor = DynNonConst<ZVisitor_Expr_Bool_ValPred>(&iVisitor))
+ this->Accept_Expr_Bool_ValPred(*theVisitor);
else
- { inherited::Accept_Expr_Op0(iVisitor); }
+ inherited::Accept_Expr_Op0(iVisitor);
}
ZRef<ZExpr_Bool> ZExpr_Bool_ValPred::Self()
Modified: trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZExpr_Op_T.h 2012-01-26 18:22:12 UTC (rev 2691)
@@ -49,7 +49,7 @@
// From ZVisitee
virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T> >(&iVisitor))
this->Accept_Expr_Op0(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -58,7 +58,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op0_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op0_T<T> >(&iVisitor))
{
this->Accept_Expr_Op0(*theVisitor);
}
@@ -114,7 +114,7 @@
// From ZVisitee
virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T> >(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -123,7 +123,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op1_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op1_T<T> >(&iVisitor))
this->Accept_Expr_Op1(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
@@ -186,7 +186,7 @@
// From ZVisitee
virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T> >(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -195,7 +195,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_Op2_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_Op2_T<T> >(&iVisitor))
this->Accept_Expr_Op2(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
@@ -261,7 +261,7 @@
// From ZVisitee
virtual void Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T> >(&iVisitor))
this->Accept_Expr_OpN(*theVisitor);
else
ZExpr::Accept(iVisitor);
@@ -270,7 +270,7 @@
// From ZExpr
virtual void Accept_Expr(ZVisitor_Expr& iVisitor)
{
- if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T>*>(&iVisitor))
+ if (ZVisitor_Expr_OpN_T<T>* theVisitor = DynNonConst<ZVisitor_Expr_OpN_T<T> >(&iVisitor))
this->Accept_Expr_OpN(*theVisitor);
else
ZExpr::Accept_Expr(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/ZYad.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYad.cpp 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/ZYad.cpp 2012-01-26 18:22:12 UTC (rev 2691)
@@ -92,7 +92,7 @@
void ZYadR::Accept(const ZVisitor& iVisitor)
{
- if (ZVisitor_Yad* theVisitor = DynNonConst<ZVisitor_Yad*>(&iVisitor))
+ if (ZVisitor_Yad* theVisitor = DynNonConst<ZVisitor_Yad>(&iVisitor))
this->Accept_Yad(*theVisitor);
else
ZVisitee::Accept(iVisitor);
Modified: trunk/zoolib/source/cxx/zoolib/zconfigl.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/zconfigl.h 2012-01-26 17:23:43 UTC (rev 2690)
+++ trunk/zoolib/source/cxx/zoolib/zconfigl.h 2012-01-26 18:22:12 UTC (rev 2691)
@@ -334,17 +334,33 @@
{ return const_cast<T*>(iT); }
template <class T>
+T* NonConst(T* iT)
+ { return iT; }
+
+template <class T>
T& NonConst(const T& iT)
{ return const_cast<T&>(iT); }
+template <class T>
+T& NonConst(T& iT)
+ { return iT; }
+
template <class P, class T>
-P DynNonConst(const T* iT)
- { return dynamic_cast<P>(NonConst(iT)); }
+P* DynNonConst(const T* iT)
+ { return dynamic_cast<P*>(NonConst(iT)); }
template <class P, class T>
-P DynNonConst(const T& iT)
- { return dynamic_cast<P>(NonConst(iT)); }
+P* DynNonConst(T* iT)
+ { return dynamic_cast<P*>(iT); }
+template <class P, class T>
+P& DynNonConst(const T& iT)
+ { return dynamic_cast<P&>(NonConst(iT)); }
+
+template <class P, class T>
+P& DynNonConst(T& iT)
+ { return dynamic_cast<P&>(iT); }
+
} // namespace ZooLib
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ag...@us...> - 2012-02-01 00:10:32
|
Revision: 2704
http://zoolib.svn.sourceforge.net/zoolib/?rev=2704&view=rev
Author: agreen
Date: 2012-02-01 00:10:19 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Switch away from the #\t approach.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp
trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp
trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp
trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h
trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp
trunk/zoolib/source/cxx/zoolib/ZAtomic.h
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h
trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp
trunk/zoolib/source/cxx/zoolib/ZByteSwap.h
trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h
trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h
trunk/zoolib/source/cxx/zoolib/ZCompare_T.h
trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h
trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h
trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h
trunk/zoolib/source/cxx/zoolib/ZCompat_string.h
trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp
trunk/zoolib/source/cxx/zoolib/ZDCFont.h
trunk/zoolib/source/cxx/zoolib/ZDCPixmapBlit.cpp
trunk/zoolib/source/cxx/zoolib/ZDCPixmapCoder_BMP.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.cpp
trunk/zoolib/source/cxx/zoolib/ZDebug.h
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZFile_POSIX.h
trunk/zoolib/source/cxx/zoolib/ZFile_Win.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_HRGN.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_RgnHandle.h
trunk/zoolib/source/cxx/zoolib/ZGRgnRep_XRegion.h
trunk/zoolib/source/cxx/zoolib/ZGeom.h
trunk/zoolib/source/cxx/zoolib/ZMACRO_typeof.h
trunk/zoolib/source/cxx/zoolib/ZMacCFM.h
trunk/zoolib/source/cxx/zoolib/ZMacOSX.cpp
trunk/zoolib/source/cxx/zoolib/ZMain.cpp
trunk/zoolib/source/cxx/zoolib/ZNetDNSSD.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_MacOT_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Internet_WinSock.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Socket.h
trunk/zoolib/source/cxx/zoolib/ZNet_Local_Win.h
trunk/zoolib/source/cxx/zoolib/ZNet_RFCOMM_OSX.h
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.cpp
trunk/zoolib/source/cxx/zoolib/ZNet_Socket.h
trunk/zoolib/source/cxx/zoolib/ZRGBA.h
trunk/zoolib/source/cxx/zoolib/ZRef.h
trunk/zoolib/source/cxx/zoolib/ZStackCrawl.h
trunk/zoolib/source/cxx/zoolib/ZStream.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_MD5.h
trunk/zoolib/source/cxx/zoolib/ZStream_POSIX.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.cpp
trunk/zoolib/source/cxx/zoolib/ZStream_SHA1.h
trunk/zoolib/source/cxx/zoolib/ZStream_ZLib.h
trunk/zoolib/source/cxx/zoolib/ZStream_bzip2.h
trunk/zoolib/source/cxx/zoolib/ZString.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCoder_ICU.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Mac.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_Win.h
trunk/zoolib/source/cxx/zoolib/ZTextCoder_iconv.h
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.cpp
trunk/zoolib/source/cxx/zoolib/ZTextCollator_ICU.h
trunk/zoolib/source/cxx/zoolib/ZThread_MacMP.h
trunk/zoolib/source/cxx/zoolib/ZThread_Win.h
trunk/zoolib/source/cxx/zoolib/ZThread_boost.h
trunk/zoolib/source/cxx/zoolib/ZThread_pthread.h
trunk/zoolib/source/cxx/zoolib/ZTime.cpp
trunk/zoolib/source/cxx/zoolib/ZUSB_OSX.h
trunk/zoolib/source/cxx/zoolib/ZUnicode.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_ATSUI.h
trunk/zoolib/source/cxx/zoolib/ZUtil_AppleEvent.h
trunk/zoolib/source/cxx/zoolib/ZUtil_Debug.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_POSIXFD.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_Time.cpp
trunk/zoolib/source/cxx/zoolib/ZUtil_string.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_AppleEvent.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
trunk/zoolib/source/cxx/zoolib/zconfigl.h
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_BBDevMgr.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__BlackBerry_BBDevMgr
-# define ZCONFIG_API_Avail__BlackBerry_BBDevMgr ZCONFIG_SPI_Enabled(Win)
+ #define ZCONFIG_API_Avail__BlackBerry_BBDevMgr ZCONFIG_SPI_Enabled(Win)
#endif
#ifndef ZCONFIG_API_Desired__BlackBerry_BBDevMgr
-# define ZCONFIG_API_Desired__BlackBerry_BBDevMgr 1
+ #define ZCONFIG_API_Desired__BlackBerry_BBDevMgr 1
#endif
#include "zoolib/blackberry/ZBlackBerry.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -275,7 +275,7 @@
ZAssert(!req);
fOpen = false;
-//## ZStreamerWriter::Wake();
+//# #ZStreamerWriter::Wake();
return false;
}
@@ -306,7 +306,7 @@
void Device_Client::Stop()
{
fOpen = false;
-//## ZStreamerWriter::Wake();
+//# #ZStreamerWriter::Wake();
}
// =================================================================================================
@@ -347,7 +347,7 @@
fSendClose = true;
this->WakeWrite();
-//## ZCommer::ReadFinished();
+//# #ZCommer::ReadFinished();
}
bool Manager_Client::Commer_Changed::Read(const ZStreamR& r)
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -367,8 +367,8 @@
// Watcher fired, but could not create a USBDevice.
if (ZLOG(s, eNotice, "ZBlackBerry::Manager_OSXUSB"))
s << "Added, invoked with null device, PocketMac drivers installed?";
-//## if (fPocketMacDriverInstalled)
-//## fObserver->AddFailed();
+//# #if (fPocketMacDriverInstalled)
+//# #fObserver->AddFailed();
return;
}
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -27,17 +27,17 @@
#include "zoolib/ZUSB_OSX.h"
#ifndef ZCONFIG_API_Avail__BlackBerry_OSXUSB
-# if ZCONFIG_API_Enabled(USB_OSX)
-# define ZCONFIG_API_Avail__BlackBerry_OSXUSB 1
-# endif
+ #if ZCONFIG_API_Enabled(USB_OSX)
+ #define ZCONFIG_API_Avail__BlackBerry_OSXUSB 1
+ #endif
#endif
#ifndef ZCONFIG_API_Avail__BlackBerry_OSXUSB
-# define ZCONFIG_API_Avail__BlackBerry_OSXUSB 0
+ #define ZCONFIG_API_Avail__BlackBerry_OSXUSB 0
#endif
#ifndef ZCONFIG_API_Desired__BlackBerry_OSXUSB
-# define ZCONFIG_API_Desired__BlackBerry_OSXUSB 1
+ #define ZCONFIG_API_Desired__BlackBerry_OSXUSB 1
#endif
#include "zoolib/blackberry/ZBlackBerry.h"
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -278,7 +278,7 @@
s << "\nDatonSet Raw:\n" << iAdded->GetRel();
ZRef<ZRA::Expr_Rel> theRel = iAdded->GetRel();
-//## theRel = ZQE::sTransform_Search(theRel);
+//# #theRel = ZQE::sTransform_Search(theRel);
if (ZLOGPF(s, eDebug + 1))
s << "\nDatonSet Cooked:\n" << theRel;
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_IFF.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,7 +25,7 @@
#include <string.h> // For strlen
#ifndef kDebug_IFF
-# define kDebug_IFF 1
+ #define kDebug_IFF 1
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/fileformat/ZFileFormat_QuickTime.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,7 +25,7 @@
#include <string.h> // For strlen
#ifndef kDebug_QTFile
-# define kDebug_QTFile 1
+ #define kDebug_QTFile 1
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZCompat_npapi.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -40,7 +40,7 @@
#endif
#ifndef ZCONFIG_NPStringUpperCaseFieldNames
- # define ZCONFIG_NPStringUpperCaseFieldNames 1
+ #define ZCONFIG_NPStringUpperCaseFieldNames 1
#endif
#define NPEventType_GetFocusEvent getFocusEvent
@@ -54,26 +54,26 @@
#endif
#if defined(_NPFUNCTIONS_H_)
-# define ZCONFIG_NPAPI_WebKit_10_4 1
+ #define ZCONFIG_NPAPI_WebKit_10_4 1
#elif defined(NPFUNCTIONS_H)
-# if defined(EXPORTED_CALLBACK)
-# define ZCONFIG_NPAPI_WebKit_Recent 1
-# else
-# define ZCONFIG_NPAPI_WebKit_10_5 1
-# endif
+ #if defined(EXPORTED_CALLBACK)
+ #define ZCONFIG_NPAPI_WebKit_Recent 1
+ #else
+ #define ZCONFIG_NPAPI_WebKit_10_5 1
+ #endif
#elif defined(_NPUPP_H_)
-# if defined(_NPUPP_USE_UPP_)
-# define ZCONFIG_NPAPI_Mozilla_Old 1
-# else
-# define ZCONFIG_NPAPI_Mozilla_New 1
-# endif
+ #if defined(_NPUPP_USE_UPP_)
+ #define ZCONFIG_NPAPI_Mozilla_Old 1
+ #else
+ #define ZCONFIG_NPAPI_Mozilla_New 1
+ #endif
#endif
// =================================================================================================
// Fixup the NPString field name change
#ifndef ZCONFIG_NPStringUpperCaseFieldNames
-# define ZCONFIG_NPStringUpperCaseFieldNames 0
+ #define ZCONFIG_NPStringUpperCaseFieldNames 0
#endif
#if ZCONFIG_NPStringUpperCaseFieldNames
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_API.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -58,19 +58,19 @@
#if ZCONFIG_SPI_Enabled(Win)
-# define XP_WIN 1
+ #define XP_WIN 1
#elif ZCONFIG_SPI_Enabled(Carbon64)
-# if __MACH__
-# define XP_MACOSX 1
-# else
-# define XP_MAC 1
-# endif
+ #if __MACH__
+ #define XP_MACOSX 1
+ #else
+ #define XP_MAC 1
+ #endif
#elif ZCONFIG_SPI_Enabled(X11)
-# define XP_UNIX 1
+ #define XP_UNIX 1
#endif
@@ -78,34 +78,34 @@
// MARK: - NP_NO_QUICKDRAW and NP_NO_CARBON
#if defined(XP_MACOSX) && __LP64__
-# define NP_NO_QUICKDRAW 1
-# define NP_NO_CARBON 1
+ #define NP_NO_QUICKDRAW 1
+ #define NP_NO_CARBON 1
#endif
// =================================================================================================
// MARK: - Mac headers
#if defined(XP_MACOSX)
-# include <ApplicationServices/ApplicationServices.h>
-# include <OpenGL/OpenGL.h>
+ #include <ApplicationServices/ApplicationServices.h>
+ #include <OpenGL/OpenGL.h>
#endif
#if defined(XP_MACOSX) || defined(XP_MAC)
-# include ZMACINCLUDE2(Carbon,Carbon.h)
+ #include ZMACINCLUDE2(Carbon,Carbon.h)
#endif
// =================================================================================================
// MARK: - Windows headers
#if defined(XP_WIN)
-# include "zoolib/ZCompat_Win.h"
+ #include "zoolib/ZCompat_Win.h"
#endif
// =================================================================================================
// MARK: - UNIX headers
#if defined(XP_UNIX)
-# include "zoolib/ZCompat_XLib.h"
+ #include "zoolib/ZCompat_XLib.h"
#endif
// =================================================================================================
@@ -119,9 +119,9 @@
#pragma mark "* Mac-specific, set structure alignment to be 68K"
#if ! __LP64__
-# if defined(XP_MAC) || defined(XP_MACOSX)
-# pragma options align=mac68k
-# endif
+ #if defined(XP_MAC) || defined(XP_MACOSX)
+ #pragma options align=mac68k
+ #endif
#endif
// =================================================================================================
@@ -903,15 +903,15 @@
// MARK: - Mac-specific, reset structure alignment
#if ! __LP64__
-# if defined(XP_MAC) || defined(XP_MACOSX)
-# pragma options align=reset
-# endif
+ #if defined(XP_MAC) || defined(XP_MACOSX)
+ #pragma options align=reset
+ #endif
#endif
#if defined(XP_WIN)
-# define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (__stdcall * _name)
+ #define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (__stdcall * _name)
#else
-# define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (* _name)
+ #define ZNetscape_API_EXPORTED_CALLBACK(_type, _name) _type (* _name)
#endif
Modified: trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/netscape/ZNetscape_GuestEntry.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -32,11 +32,11 @@
// =================================================================================================
#if defined(XP_WIN)
-# define EXPORT_DECL(ret) extern "C" __declspec(dllexport) ret __stdcall
-# define EXPORT_DEF(ret) ret __stdcall
+ #define EXPORT_DECL(ret) extern "C" __declspec(dllexport) ret __stdcall
+ #define EXPORT_DEF(ret) ret __stdcall
#else
-# define EXPORT_DECL(ret) extern "C" __attribute__((visibility("default"))) ret
-# define EXPORT_DEF(ret) ret
+ #define EXPORT_DECL(ret) extern "C" __attribute__((visibility("default"))) ret
+ #define EXPORT_DEF(ret) ret
#endif
#if !ZCONFIG(Processor, PPC) || !__MACH__
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -461,7 +461,7 @@
#elif defined(__PIWin__)
// Need to look at this again when we're doing 64 bit compiles.
-//## ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
+//# #ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
UseHandle useHandle(fHandle);
size_t handleSize = useHandle.Size();
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -28,11 +28,11 @@
#include "PIUSuites.h"
#if ZCONFIG_SPI_Enabled(Carbon64)
-# if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-# include ZMACINCLUDE3(ApplicationServices,AE,AEObjects.h)
-# else
-# include ZMACINCLUDE3(CoreServices,AE,AEObjects.h)
-# endif
+ #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
+ #include ZMACINCLUDE3(ApplicationServices,AE,AEObjects.h)
+ #else
+ #include ZMACINCLUDE3(CoreServices,AE,AEObjects.h)
+ #endif
#endif
#if ZCONFIG_SPI_Enabled(Win)
@@ -364,7 +364,7 @@
TypeID theType;
if (noErr != spPSActionList->GetType(iSource, x, &theType))
break;
-//## COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
+//# #COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
}
}
return theDest;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDCInk.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -54,20 +54,20 @@
#if ZCONFIG(Compiler, CodeWarrior)
// Enforce higher level of optimization for this code -- otherwise
// the funky switch stuff is all for naught.
-# pragma push
-# pragma optimization_level 4
-# pragma opt_common_subs on
-# pragma opt_lifetimes on
-# pragma peephole on
-# if ZCONFIG(Processor, x86)
-# pragma register_coloring on
-# endif
+ #pragma push
+ #pragma optimization_level 4
+ #pragma opt_common_subs on
+ #pragma opt_lifetimes on
+ #pragma peephole on
+ #if ZCONFIG(Processor, x86)
+ #pragma register_coloring on
+ #endif
#endif
#if ZCONFIG(Compiler, CodeWarrior) && (ZCONFIG(Processor, 68K) || ZCONFIG(Processor, x86))
-# define RotateLeft(a,b,c) __rol(a,b)
+ #define RotateLeft(a,b,c) __rol(a,b)
#else
-# define RotateLeft(value, distance, eightMinusDistance) \
+ #define RotateLeft(value, distance, eightMinusDistance) \
(((value) << (distance)) | ((value) >> (eightMinusDistance)))
#endif
@@ -153,7 +153,7 @@
}
#if ZCONFIG(Compiler, CodeWarrior)
-# pragma pop
+ #pragma pop
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDCPixmap_Asset_BMP.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -29,10 +29,10 @@
// From wingdi.h
#ifndef BI_RGB
-# define BI_RGB 0L
-# define BI_RLE8 1L
-# define BI_RLE4 2L
-# define BI_BITFIELDS 3L
+ #define BI_RGB 0L
+ #define BI_RLE8 1L
+ #define BI_RLE4 2L
+ #define BI_BITFIELDS 3L
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDCPoly.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -75,7 +75,7 @@
#include "zoolib/ZMemory.h" // For ZMemCopy
#if ZCONFIG_SPI_Enabled(QuickDraw)
-# include ZMACINCLUDE3(CoreServices,CarbonCore,MacMemory.h) // For HLock etc.
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,MacMemory.h) // For HLock etc.
#endif
using ZooLib::ZCoord;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_GDI.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__DC_GDI
-# define ZCONFIG_API_Avail__DC_GDI ZCONFIG_SPI_Enabled(GDI)
+ #define ZCONFIG_API_Avail__DC_GDI ZCONFIG_SPI_Enabled(GDI)
#endif
#ifndef ZCONFIG_API_Desired__DC_GDI
-# define ZCONFIG_API_Desired__DC_GDI 1
+ #define ZCONFIG_API_Desired__DC_GDI 1
#endif
#include "zoolib/ZDC.h"
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -38,14 +38,14 @@
// If we're using the old headers then MacLineTo won't be defined
#if !defined(TARGET_OS_MAC) || (TARGET_OS_MAC && !defined(MacLineTo))
-# define MacLineTo LineTo
-# define MacFrameRect FrameRect
-# define MacInvertRect InvertRect
-# define MacFrameRgn FrameRgn
-# define MacInvertRgn InvertRgn
-# define MacPaintRgn PaintRgn
-# define MacDrawText DrawText
-# define MacOffsetRgn OffsetRgn
+ #define MacLineTo LineTo
+ #define MacFrameRect FrameRect
+ #define MacInvertRect InvertRect
+ #define MacFrameRgn FrameRgn
+ #define MacInvertRgn InvertRgn
+ #define MacPaintRgn PaintRgn
+ #define MacDrawText DrawText
+ #define MacOffsetRgn OffsetRgn
#endif
#include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMSetHiliteMode
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_QD.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__DC_QD
-# define ZCONFIG_API_Avail__DC_QD ZCONFIG_SPI_Enabled(QuickDraw)
+ #define ZCONFIG_API_Avail__DC_QD ZCONFIG_SPI_Enabled(QuickDraw)
#endif
#ifndef ZCONFIG_API_Desired__DC_QD
-# define ZCONFIG_API_Desired__DC_QD 1
+ #define ZCONFIG_API_Desired__DC_QD 1
#endif
Modified: trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZDC_X.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -25,11 +25,11 @@
#include "zoolib/ZCONFIG_SPI.h"
#ifndef ZCONFIG_API_Avail__DC_X
-# define ZCONFIG_API_Avail__DC_X ZCONFIG_SPI_Enabled(X11)
+ #define ZCONFIG_API_Avail__DC_X ZCONFIG_SPI_Enabled(X11)
#endif
#ifndef ZCONFIG_API_Desired__DC_X
-# define ZCONFIG_API_Desired__DC_X 1
+ #define ZCONFIG_API_Desired__DC_X 1
#endif
#include "zoolib/ZDC.h"
Modified: trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -52,7 +52,7 @@
virtual ZRef<ZNodeRep> CreateDir(Error* oError);
virtual ZRef<ZNodeRep> MoveTo(ZRef<ZNodeRep> iDest, Error* oError);
-//## virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
+//# #virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
virtual bool Delete(Error* oError);
virtual ZRef<ZStreamerR> OpenR(bool iPreventWriters, Error* oError);
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Asset.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -33,18 +33,18 @@
#include "zoolib/ZString.h" // For pascal string conversions
#if ZCONFIG_SPI_Enabled(POSIX)
-# include <sys/types.h> // For lseek
-# include <fcntl.h> // For open
-# include <unistd.h> // For lseek
+ #include <sys/types.h> // For lseek
+ #include <fcntl.h> // For open
+ #include <unistd.h> // For lseek
#endif
#if ZCONFIG_SPI_Enabled(Win)
-# include "zoolib/ZUnicode.h"
-# include "zoolib/ZUtil_Win.h"
+ #include "zoolib/ZUnicode.h"
+ #include "zoolib/ZUtil_Win.h"
#endif
#if ZCONFIG_SPI_Enabled(Carbon)
-# include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Graphics.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -28,8 +28,8 @@
#include "zoolib/ZDC_QD.h"
#if ZCONFIG_SPI_Enabled(MacClassic) || ZCONFIG_SPI_Enabled(Carbon)
-# include ZMACINCLUDE3(Carbon,HIToolbox,Drag.h) // For GetDragHiliteColor
-# include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMGetHiliteRGB
+ #include ZMACINCLUDE3(Carbon,HIToolbox,Drag.h) // For GetDragHiliteColor
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,LowMem.h) // For LMGetHiliteRGB
#endif
using std::vector;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -587,8 +587,8 @@
if (inColorPixmap)
sAddPixmapToIconFamily(inColorPixmap, eData8, theIconFamilyHandle);
-//## if (inColorPixmap)
-//## sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
+//# #if (inColorPixmap)
+//# #sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
if (inMonoPixmap)
sAddPixmapToIconFamily(inMonoPixmap, eData1, theIconFamilyHandle);
@@ -635,7 +635,7 @@
/* if (ZApp::sGet())
{
ZDCRgn theDCRgn;
-//## ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
+//# #ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
::MacCopyRgn(theDCRgn, *outMouseRgn);
}*/
return false;
@@ -671,8 +671,8 @@
static ModalFilterUPP sModalFilterUPP = NewModalFilterUPP(ZUtil_Mac_HL::sModalFilter);
pascal Boolean ZUtil_Mac_HL::sModalFilter(DialogPtr theDialog, EventRecord* inOutEventRecord, short* inOutItemHit)
{
-//## if (ZApp::sGet())
-//## return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
+//# #if (ZApp::sGet())
+//# #return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
return false;
}
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_LL.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -30,7 +30,7 @@
#include <new> // for bad_alloc
#if ZCONFIG_SPI_Enabled(Carbon)
-# include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
+ #include ZMACINCLUDE3(CoreServices,CarbonCore,Resources.h)
#endif
using std::bad_alloc;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -76,7 +76,7 @@
"Vector",
"Type",
"Time",
-//## "Name"
+//# #"Name"
};
const char* ZTypeAsString(ZType iType)
@@ -1486,7 +1486,7 @@
case eZType_Rect: delete fData.fAs_Rect; break;
case eZType_String: sDtor_T<ValString>(fType.fBytes); break;
-//## case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
+//# #case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
case eZType_Tuple: sDtor_T<ZMap_ZooLib>(fType.fBytes); break;
case eZType_RefCounted:
{
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -36,7 +36,7 @@
#include <vector>
#ifndef ZCONFIG_Val_ZooLib_Packed
-# define ZCONFIG_Val_ZooLib_Packed 1
+ #define ZCONFIG_Val_ZooLib_Packed 1
#endif
namespace ZooLib {
@@ -82,7 +82,7 @@
eZType_Vector = 18,
eZType_Type = 19,
eZType_Time = 20,
-//## eZType_Name = 21
+//# #eZType_Name = 21
eZType_Max
};
@@ -95,7 +95,7 @@
// MARK: - ZVal_ZooLib
#if ZCONFIG_Val_ZooLib_Packed
-# pragma pack(4)
+ #pragma pack(4)
#endif
class ZVal_ZooLib
@@ -275,7 +275,7 @@
};
#if ZCONFIG_Val_ZooLib_Packed
-# pragma pack()
+ #pragma pack()
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -165,7 +165,7 @@
else if (typeValueLC == "id") oVal = eZType_ID;
else if (typeValueLC == "vector") oVal = eZType_Vector;
else if (typeValueLC == "type") oVal = eZType_Type;
-//## else if (typeValueLC == "name") oVal = eZType_Name;
+//# #else if (typeValueLC == "name") oVal = eZType_Name;
else
spThrowParseException("Unknown type name '" + typeValue + "'");
}
Modified: trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZAtomic.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -31,9 +31,9 @@
#if ZCONFIG(Compiler, CodeWarrior) && ZCONFIG(Processor, PPC)
#if 0
-# define ZAtomic_PPC405_ERR77(rA,rB) dcbt rA , rB;
+ #define ZAtomic_PPC405_ERR77(rA,rB) dcbt rA , rB;
#else
-# define ZAtomic_PPC405_ERR77(rA,rB)
+ #define ZAtomic_PPC405_ERR77(rA,rB)
#endif
// We attach a register declarator to each parameter so that CW does not generate
@@ -340,7 +340,7 @@
// MARK: - A real CompareAndSwap must be defined by now
#if !defined(DEFINED_ZAtomic_CompareAndSwap)
-# error No CompareAndSwap available
+ #error No CompareAndSwap available
#endif
// =================================================================================================
Modified: trunk/zoolib/source/cxx/zoolib/ZAtomic.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZAtomic.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZAtomic.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -111,9 +111,9 @@
can be enabled later if necessary. */
#if 0
-# define ZAtomic_PPC405_ERR77(rA,rB) "dcbt " #ra "," #rb "\n"
+ #define ZAtomic_PPC405_ERR77(rA,rB) "dcbt " #ra "," #rb "\n"
#else
-# define ZAtomic_PPC405_ERR77(rA,rB)
+ #define ZAtomic_PPC405_ERR77(rA,rB)
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -38,17 +38,17 @@
namespace ZooLib {
#ifndef kDebug_PhaseTreeFile
-# define kDebug_PhaseTreeFile 3
+ #define kDebug_PhaseTreeFile 3
#endif
#if ZCONFIG_Debug >= ZCONFIG_PhaseTree_Debug
-# define PT_INLINE
-# define ASSERT_LOCKED(a) ZAssertStop(0, a.IsLocked())
-# define ASSERT_UNLOCKED(a) ZAssertStop(0, !a.IsLocked())
+ #define PT_INLINE
+ #define ASSERT_LOCKED(a) ZAssertStop(0, a.IsLocked())
+ #define ASSERT_UNLOCKED(a) ZAssertStop(0, !a.IsLocked())
#else
-# define PT_INLINE inline
-# define ASSERT_LOCKED(a)
-# define ASSERT_UNLOCKED(a)
+ #define PT_INLINE inline
+ #define ASSERT_LOCKED(a)
+ #define ASSERT_UNLOCKED(a)
#endif
/**
Modified: trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZBlockStore_PhaseTree.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -30,7 +30,7 @@
#include <map>
#ifndef ZCONFIG_PhaseTree_Debug
-# define ZCONFIG_PhaseTree_Debug 3
+ #define ZCONFIG_PhaseTree_Debug 3
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZByteSwap.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -23,14 +23,14 @@
// Switch off optimization for CodeWarrior -- it runs out of registers.
#if ZCONFIG(Compiler, CodeWarrior)
-# pragma push
-# pragma optimization_level 1
-# pragma opt_common_subs off
-# pragma opt_lifetimes off
-# pragma peephole off
-# if ZCONFIG(Processor, x86)
-# pragma register_coloring off
-# endif
+ #pragma push
+ #pragma optimization_level 1
+ #pragma opt_common_subs off
+ #pragma opt_lifetimes off
+ #pragma peephole off
+ #if ZCONFIG(Processor, x86)
+ #pragma register_coloring off
+ #endif
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZByteSwap.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZByteSwap.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZByteSwap.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -536,11 +536,11 @@
#if !defined(ZByteSwap_EndianBig)
-# if ZCONFIG(Endian, Big)
-# define ZByteSwap_EndianBig 1
-# else
-# define ZByteSwap_EndianBig 0
-# endif
+ #if ZCONFIG(Endian, Big)
+ #define ZByteSwap_EndianBig 1
+ #else
+ #define ZByteSwap_EndianBig 0
+ #endif
inline uint16 ZByteSwap_16(uint16 iValue)
{ return (iValue >> 8) | (iValue << 8); }
Modified: trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCONFIG_SPI.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -27,18 +27,18 @@
// Pick up Apple's config macros if they're available
#if __MACH__
-# include <AvailabilityMacros.h>
-# include <TargetConditionals.h>
+ #include <AvailabilityMacros.h>
+ #include <TargetConditionals.h>
-# if TARGET_IPHONE_SIMULATOR
-# define ZMACRO_IOS 1
-# define ZMACRO_IOS_Device 0
-# define ZMACRO_IOS_Simulator 1
-# elif TARGET_OS_IPHONE
-# define ZMACRO_IOS 1
-# define ZMACRO_IOS_Device 1
-# define ZMACRO_IOS_Simulator 0
-# endif
+ #if TARGET_IPHONE_SIMULATOR
+ #define ZMACRO_IOS 1
+ #define ZMACRO_IOS_Device 0
+ #define ZMACRO_IOS_Simulator 1
+ #elif TARGET_OS_IPHONE
+ #define ZMACRO_IOS 1
+ #define ZMACRO_IOS_Device 1
+ #define ZMACRO_IOS_Simulator 0
+ #endif
#endif
@@ -51,240 +51,240 @@
// =================================================================================================
#pragma mark AppleEvent
#ifndef ZCONFIG_SPI_Avail__AppleEvent
-# define ZCONFIG_SPI_Avail__AppleEvent \
+ #define ZCONFIG_SPI_Avail__AppleEvent \
(ZCONFIG_SPI_Avail__Carbon64 && ZCONFIG_SPI_Desired__Carbon64)
#endif
#ifndef ZCONFIG_SPI_Desired__AppleEvent
-# define ZCONFIG_SPI_Desired__AppleEvent 1
+ #define ZCONFIG_SPI_Desired__AppleEvent 1
#endif
// =================================================================================================
#pragma mark BeOS
#ifndef ZCONFIG_SPI_Avail__BeOS
-# define ZCONFIG_SPI_Avail__BeOS 0
+ #define ZCONFIG_SPI_Avail__BeOS 0
#endif
#ifndef ZCONFIG_SPI_Desired__BeOS
-# define ZCONFIG_SPI_Desired__BeOS 1
+ #define ZCONFIG_SPI_Desired__BeOS 1
#endif
// =================================================================================================
#pragma mark BerkeleyDB
#ifndef ZCONFIG_SPI_Avail__BerkeleyDB
-# define ZCONFIG_SPI_Avail__BerkeleyDB (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+ #define ZCONFIG_SPI_Avail__BerkeleyDB (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
#endif
#ifndef ZCONFIG_SPI_Avail__BerkeleyDB
-# define ZCONFIG_SPI_Avail__BerkeleyDB 0
+ #define ZCONFIG_SPI_Avail__BerkeleyDB 0
#endif
#ifndef ZCONFIG_SPI_Desired__BerkeleyDB
-# define ZCONFIG_SPI_Desired__BerkeleyDB 1
+ #define ZCONFIG_SPI_Desired__BerkeleyDB 1
#endif
// =================================================================================================
#pragma mark boost
#ifndef ZCONFIG_SPI_Avail__boost
-# define ZCONFIG_SPI_Avail__boost 0
+ #define ZCONFIG_SPI_Avail__boost 0
#endif
#ifndef ZCONFIG_SPI_Desired__boost
-# define ZCONFIG_SPI_Desired__boost 1
+ #define ZCONFIG_SPI_Desired__boost 1
#endif
// =================================================================================================
#pragma mark BSD
#ifndef ZCONFIG_SPI_Avail__BSD
-# if defined(__APPLE__) \
+ #if defined(__APPLE__) \
|| defined(__NetBSD__) \
|| defined(__FreeBSD__) \
|| defined(__OpenBSD__)
-# define ZCONFIG_SPI_Avail__BSD 1
-# endif
+ #define ZCONFIG_SPI_Avail__BSD 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__BSD
-# define ZCONFIG_SPI_Avail__BSD 0
+ #define ZCONFIG_SPI_Avail__BSD 0
#endif
#ifndef ZCONFIG_SPI_Desired__BSD
-# define ZCONFIG_SPI_Desired__BSD 1
+ #define ZCONFIG_SPI_Desired__BSD 1
#endif
// =================================================================================================
#pragma mark bzip2
#ifndef ZCONFIG_SPI_Avail__bzip2
-# define ZCONFIG_SPI_Avail__bzip2 0
+ #define ZCONFIG_SPI_Avail__bzip2 0
#endif
#ifndef ZCONFIG_SPI_Desired__bzip2
-# define ZCONFIG_SPI_Desired__bzip2 1
+ #define ZCONFIG_SPI_Desired__bzip2 1
#endif
// =================================================================================================
#pragma mark Carbon
#ifndef ZCONFIG_SPI_Avail__Carbon
-# if __MACH__
-# if ! ZMACRO_IOS && ! __LP64__
-# define ZCONFIG_SPI_Avail__Carbon 1
-# endif
-# elif macintosh
-# if TARGET_API_MAC_CARBON
-# define ZCONFIG_SPI_Avail__Carbon 1
-# elif TARGET_CARBON
-# define ZCONFIG_SPI_Avail__Carbon 1
-# endif
-# endif
+ #if __MACH__
+ #if ! ZMACRO_IOS && ! __LP64__
+ #define ZCONFIG_SPI_Avail__Carbon 1
+ #endif
+ #elif macintosh
+ #if TARGET_API_MAC_CARBON
+ #define ZCONFIG_SPI_Avail__Carbon 1
+ #elif TARGET_CARBON
+ #define ZCONFIG_SPI_Avail__Carbon 1
+ #endif
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Carbon
-# define ZCONFIG_SPI_Avail__Carbon 0
+ #define ZCONFIG_SPI_Avail__Carbon 0
#endif
#ifndef ZCONFIG_SPI_Desired__Carbon
-# define ZCONFIG_SPI_Desired__Carbon 1
+ #define ZCONFIG_SPI_Desired__Carbon 1
#endif
// =================================================================================================
#pragma mark Carbon64
#ifndef ZCONFIG_SPI_Avail__Carbon64
-# if ZCONFIG_SPI_Avail__Carbon
-# define ZCONFIG_SPI_Avail__Carbon64 1
-# elif __MACH__
-# if ! ZMACRO_IOS
-# define ZCONFIG_SPI_Avail__Carbon64 1
-# endif
-# endif
+ #if ZCONFIG_SPI_Avail__Carbon
+ #define ZCONFIG_SPI_Avail__Carbon64 1
+ #elif __MACH__
+ #if ! ZMACRO_IOS
+ #define ZCONFIG_SPI_Avail__Carbon64 1
+ #endif
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__Carbon64 0
+ #define ZCONFIG_SPI_Avail__Carbon64 0
#endif
#ifndef ZCONFIG_SPI_Desired__Carbon64
-# define ZCONFIG_SPI_Desired__Carbon64 1
+ #define ZCONFIG_SPI_Desired__Carbon64 1
#endif
// =================================================================================================
#pragma mark CFType
#ifndef ZCONFIG_SPI_Avail__CFType
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CFType 1
-# elif ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__CFType 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CFType 1
+ #elif ZCONFIG_SPI_Avail__Carbon64
+ #define ZCONFIG_SPI_Avail__CFType 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CFType
-# define ZCONFIG_SPI_Avail__CFType 0
+ #define ZCONFIG_SPI_Avail__CFType 0
#endif
#ifndef ZCONFIG_SPI_Desired__CFType
-# define ZCONFIG_SPI_Desired__CFType 1
+ #define ZCONFIG_SPI_Desired__CFType 1
#endif
// =================================================================================================
#pragma mark Cocoa
#ifndef ZCONFIG_SPI_Avail__Cocoa
-# if __MACH__
-# define ZCONFIG_SPI_Avail__Cocoa 1
-# elif __COCOTRON__
-# define ZCONFIG_SPI_Avail__Cocoa 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__Cocoa 1
+ #elif __COCOTRON__
+ #define ZCONFIG_SPI_Avail__Cocoa 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Cocoa
-# define ZCONFIG_SPI_Avail__Cocoa 0
+ #define ZCONFIG_SPI_Avail__Cocoa 0
#endif
#ifndef ZCONFIG_SPI_Desired__Cocoa
-# define ZCONFIG_SPI_Desired__Cocoa 1
+ #define ZCONFIG_SPI_Desired__Cocoa 1
#endif
// =================================================================================================
#pragma mark CocoaFoundation
#ifndef ZCONFIG_SPI_Avail__CocoaFoundation
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CocoaFoundation 1
-# elif __COCOTRON__
-# define ZCONFIG_SPI_Avail__CocoaFoundation 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CocoaFoundation 1
+ #elif __COCOTRON__
+ #define ZCONFIG_SPI_Avail__CocoaFoundation 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CocoaFoundation
-# define ZCONFIG_SPI_Avail__CocoaFoundation 0
+ #define ZCONFIG_SPI_Avail__CocoaFoundation 0
#endif
#ifndef ZCONFIG_SPI_Desired__CocoaFoundation
-# define ZCONFIG_SPI_Desired__CocoaFoundation 1
+ #define ZCONFIG_SPI_Desired__CocoaFoundation 1
#endif
// =================================================================================================
#pragma mark CocoaAppKit
#ifndef ZCONFIG_SPI_Avail__CocoaAppKit
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CocoaAppKit (!ZMACRO_IOS)
-# elif __COCOTRON__
-# define ZCONFIG_SPI_Avail__CocoaAppKit 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CocoaAppKit (!ZMACRO_IOS)
+ #elif __COCOTRON__
+ #define ZCONFIG_SPI_Avail__CocoaAppKit 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CocoaAppKit
-# define ZCONFIG_SPI_Avail__CocoaAppKit 0
+ #define ZCONFIG_SPI_Avail__CocoaAppKit 0
#endif
#ifndef ZCONFIG_SPI_Desired__CocoaAppKit
-# define ZCONFIG_SPI_Desired__CocoaAppKit 1
+ #define ZCONFIG_SPI_Desired__CocoaAppKit 1
#endif
// =================================================================================================
#pragma mark CoreFoundation
#ifndef ZCONFIG_SPI_Avail__CoreFoundation
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CoreFoundation 1
-# elif ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__CoreFoundation 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CoreFoundation 1
+ #elif ZCONFIG_SPI_Avail__Carbon64
+ #define ZCONFIG_SPI_Avail__CoreFoundation 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CoreFoundation
-# define ZCONFIG_SPI_Avail__CoreFoundation 0
+ #define ZCONFIG_SPI_Avail__CoreFoundation 0
#endif
#ifndef ZCONFIG_SPI_Desired__CoreFoundation
-# define ZCONFIG_SPI_Desired__CoreFoundation 1
+ #define ZCONFIG_SPI_Desired__CoreFoundation 1
#endif
// =================================================================================================
#pragma mark CoreGraphics
#ifndef ZCONFIG_SPI_Avail__CoreGraphics
-# if __MACH__
-# define ZCONFIG_SPI_Avail__CoreGraphics 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__CoreGraphics 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__CoreGraphics
-# define ZCONFIG_SPI_Avail__CoreGraphics 0
+ #define ZCONFIG_SPI_Avail__CoreGraphics 0
#endif
#ifndef ZCONFIG_SPI_Desired__CoreGraphics
-# define ZCONFIG_SPI_Desired__CoreGraphics 1
+ #define ZCONFIG_SPI_Desired__CoreGraphics 1
#endif
@@ -293,63 +293,63 @@
#ifndef ZCONFIG_SPI_Avail__DNSSD
// Not sure about this one. Assumes POSIX for now, may need to drop back
// to MacOSX and Linux only (by default).
-# define ZCONFIG_SPI_Avail__DNSSD (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+ #define ZCONFIG_SPI_Avail__DNSSD (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
#endif
#ifndef ZCONFIG_SPI_Avail__DNSSD
-# define ZCONFIG_SPI_Avail__DNSSD 0
+ #define ZCONFIG_SPI_Avail__DNSSD 0
#endif
#ifndef ZCONFIG_SPI_Desired__DNSSD
-# define ZCONFIG_SPI_Desired__DNSSD 1
+ #define ZCONFIG_SPI_Desired__DNSSD 1
#endif
// =================================================================================================
#pragma mark GDI
#ifndef ZCONFIG_SPI_Avail__GDI
-# define ZCONFIG_SPI_Avail__GDI (ZCONFIG_SPI_Avail__Win && ZCONFIG_SPI_Desired__Win)
+ #define ZCONFIG_SPI_Avail__GDI (ZCONFIG_SPI_Avail__Win && ZCONFIG_SPI_Desired__Win)
#endif
#ifndef ZCONFIG_SPI_Avail__GDI
-# define ZCONFIG_SPI_Avail__GDI 0
+ #define ZCONFIG_SPI_Avail__GDI 0
#endif
#ifndef ZCONFIG_SPI_Desired__GDI
-# define ZCONFIG_SPI_Desired__GDI 1
+ #define ZCONFIG_SPI_Desired__GDI 1
#endif
// =================================================================================================
#pragma mark iconv
#ifndef ZCONFIG_SPI_Avail__iconv
-# define ZCONFIG_SPI_Avail__iconv \
+ #define ZCONFIG_SPI_Avail__iconv \
((ZCONFIG_SPI_Avail__MacOSX && ZCONFIG_SPI_Desired__MacOSX) || ZMACRO_IOS)
#endif
#ifndef ZCONFIG_SPI_Desired__iconv
-# define ZCONFIG_SPI_Desired__iconv 1
+ #define ZCONFIG_SPI_Desired__iconv 1
#endif
// =================================================================================================
#pragma mark ICU
#ifndef ZCONFIG_SPI_Avail__ICU
-# define ZCONFIG_SPI_Avail__ICU 0
+ #define ZCONFIG_SPI_Avail__ICU 0
#endif
#ifndef ZCONFIG_SPI_Desired__ICU
-# define ZCONFIG_SPI_Desired__ICU 1
+ #define ZCONFIG_SPI_Desired__ICU 1
#endif
// =================================================================================================
#pragma mark imagehlp
#ifndef ZCONFIG_SPI_Avail__imagehlp
-# define ZCONFIG_SPI_Avail__imagehlp 0
+ #define ZCONFIG_SPI_Avail__imagehlp 0
#endif
#ifndef ZCONFIG_SPI_Desired__imagehlp
-# define ZCONFIG_SPI_Desired__imagehlp 1
+ #define ZCONFIG_SPI_Desired__imagehlp 1
#endif
@@ -357,218 +357,218 @@
#pragma mark iPhone
#ifndef ZCONFIG_SPI_Avail__iPhone
-# if ZMACRO_IOS
-# define ZCONFIG_SPI_Avail__iPhone 1
-# endif
+ #if ZMACRO_IOS
+ #define ZCONFIG_SPI_Avail__iPhone 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__iPhone
-# define ZCONFIG_SPI_Avail__iPhone 0
+ #define ZCONFIG_SPI_Avail__iPhone 0
#endif
#ifndef ZCONFIG_SPI_Desired__iPhone
-# define ZCONFIG_SPI_Desired__iPhone 1
+ #define ZCONFIG_SPI_Desired__iPhone 1
#endif
// =================================================================================================
#pragma mark Linux
#ifndef ZCONFIG_SPI_Avail__Linux
-# ifdef linux
-# define ZCONFIG_SPI_Avail__Linux 1
-# endif
+ #ifdef linux
+ #define ZCONFIG_SPI_Avail__Linux 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Linux
-# define ZCONFIG_SPI_Avail__Linux 0
+ #define ZCONFIG_SPI_Avail__Linux 0
#endif
#ifndef ZCONFIG_SPI_Desired__Linux
-# define ZCONFIG_SPI_Desired__Linux 1
+ #define ZCONFIG_SPI_Desired__Linux 1
#endif
// =================================================================================================
#pragma mark MacClassic
#ifndef ZCONFIG_SPI_Avail__MacClassic
-# if macintosh && ! ZCONFIG_SPI_Avail__Carbon
-# define ZCONFIG_SPI_Avail__MacClassic 1
-# endif
+ #if macintosh && ! ZCONFIG_SPI_Avail__Carbon
+ #define ZCONFIG_SPI_Avail__MacClassic 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__MacClassic
-# define ZCONFIG_SPI_Avail__MacClassic 0
+ #define ZCONFIG_SPI_Avail__MacClassic 0
#endif
#ifndef ZCONFIG_SPI_Desired__MacClassic
-# define ZCONFIG_SPI_Desired__MacClassic 1
+ #define ZCONFIG_SPI_Desired__MacClassic 1
#endif
// =================================================================================================
#pragma mark MacMP
#ifndef ZCONFIG_SPI_Avail__MacMP
-# if macintosh || ZCONFIG_SPI_Avail__Carbon64
-# define ZCONFIG_SPI_Avail__MacMP 1
-# endif
+ #if macintosh || ZCONFIG_SPI_Avail__Carbon64
+ #define ZCONFIG_SPI_Avail__MacMP 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__MacMP
-# define ZCONFIG_SPI_Avail__MacMP 0
+ #define ZCONFIG_SPI_Avail__MacMP 0
#endif
#ifndef ZCONFIG_SPI_Desired__MacMP
-# define ZCONFIG_SPI_Desired__MacMP 1
+ #define ZCONFIG_SPI_Desired__MacMP 1
#endif
// =================================================================================================
#pragma mark MacOSX
#ifndef ZCONFIG_SPI_Avail__MacOSX
-# if __MACH__ && ! ZMACRO_IOS
-# define ZCONFIG_SPI_Avail__MacOSX 1
-# endif
+ #if __MACH__ && ! ZMACRO_IOS
+ #define ZCONFIG_SPI_Avail__MacOSX 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__MacOSX
-# define ZCONFIG_SPI_Avail__MacOSX 0
+ #define ZCONFIG_SPI_Avail__MacOSX 0
#endif
#ifndef ZCONFIG_SPI_Desired__MacOSX
-# define ZCONFIG_SPI_Desired__MacOSX 1
+ #define ZCONFIG_SPI_Desired__MacOSX 1
#endif
// =================================================================================================
#pragma mark openssl
#ifndef ZCONFIG_SPI_Avail__openssl
-# define ZCONFIG_SPI_Avail__openssl 0
+ #define ZCONFIG_SPI_Avail__openssl 0
#endif
#ifndef ZCONFIG_SPI_Desired__openssl
-# define ZCONFIG_SPI_Desired__openssl 1
+ #define ZCONFIG_SPI_Desired__openssl 1
#endif
// =================================================================================================
#pragma mark POSIX
#ifndef ZCONFIG_SPI_Avail__POSIX
-# if __MACH__
-# define ZCONFIG_SPI_Avail__POSIX 1
-# elif linux
-# define ZCONFIG_SPI_Avail__POSIX 1
-# endif
+ #if __MACH__
+ #define ZCONFIG_SPI_Avail__POSIX 1
+ #elif linux
+ #define ZCONFIG_SPI_Avail__POSIX 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__POSIX
-# define ZCONFIG_SPI_Avail__POSIX 0
+ #define ZCONFIG_SPI_Avail__POSIX 0
#endif
#ifndef ZCONFIG_SPI_Desired__POSIX
-# define ZCONFIG_SPI_Desired__POSIX 1
+ #define ZCONFIG_SPI_Desired__POSIX 1
#endif
// =================================================================================================
#pragma mark pthread
#ifndef ZCONFIG_SPI_Avail__pthread
-# define ZCONFIG_SPI_Avail__pthread (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+ #define ZCONFIG_SPI_Avail__pthread (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
#endif
#ifndef ZCONFIG_SPI_Avail__pthread
-# define ZCONFIG_SPI_Avail__pthread 0
+ #define ZCONFIG_SPI_Avail__pthread 0
#endif
#ifndef ZCONFIG_SPI_Desired__pthread
-# define ZCONFIG_SPI_Desired__pthread 1
+ #define ZCONFIG_SPI_Desired__pthread 1
#endif
// =================================================================================================
#pragma mark QuickDraw
#ifndef ZCONFIG_SPI_Avail__QuickDraw
-# define ZCONFIG_SPI_Avail__QuickDraw \
+ #define ZCONFIG_SPI_Avail__QuickDraw \
((ZCONFIG_SPI_Avail__Carbon && ZCONFIG_SPI_Desired__Carbon) \
|| (ZCONFIG_SPI_Avail__MacClassic && ZCONFIG_SPI_Desired__MacClassic))
#endif
#ifndef ZCONFIG_SPI_Avail__QuickDraw
-# define ZCONFIG_SPI_Avail__QuickDraw 0
+ #define ZCONFIG_SPI_Avail__QuickDraw 0
#endif
#ifndef ZCONFIG_SPI_Desired__QuickDraw
-# define ZCONFIG_SPI_Desired__QuickDraw 1
+ #define ZCONFIG_SPI_Desired__QuickDraw 1
#endif
// =================================================================================================
#pragma mark stlsoft
#ifndef ZCONFIG_SPI_Avail__stlsoft
-# define ZCONFIG_SPI_Avail__stlsoft 0
+ #define ZCONFIG_SPI_Avail__stlsoft 0
#endif
#ifndef ZCONFIG_SPI_Desired__stlsoft
-# define ZCONFIG_SPI_Desired__stlsoft 1
+ #define ZCONFIG_SPI_Desired__stlsoft 1
#endif
// =================================================================================================
#pragma mark SystemConfiguration
#ifndef ZCONFIG_SPI_Avail__SystemConfiguration
-# define ZCONFIG_SPI_Avail__SystemConfiguration ZCONFIG_SPI_Avail__MacOSX
+ #define ZCONFIG_SPI_Avail__SystemConfiguration ZCONFIG_SPI_Avail__MacOSX
#endif
#ifndef ZCONFIG_SPI_Avail__SystemConfiguration
-# define ZCONFIG_SPI_Avail__SystemConfiguration 0
+ #define ZCONFIG_SPI_Avail__SystemConfiguration 0
#endif
#ifndef ZCONFIG_SPI_Desired__SystemConfiguration
-# define ZCONFIG_SPI_Desired__SystemConfiguration 1
+ #define ZCONFIG_SPI_Desired__SystemConfiguration 1
#endif
// =================================================================================================
#pragma mark Win
#ifndef ZCONFIG_SPI_Avail__Win
-# if defined(WIN32) || defined(_WIN32) || defined(WINDOWS)
-# define ZCONFIG_SPI_Avail__Win 1
-# elif __MWERKS__ && __INTEL__
-# define ZCONFIG_SPI_Avail__Win 1
-# endif
+ #if defined(WIN32) || defined(_WIN32) || defined(WINDOWS)
+ #define ZCONFIG_SPI_Avail__Win 1
+ #elif __MWERKS__ && __INTEL__
+ #define ZCONFIG_SPI_Avail__Win 1
+ #endif
#endif
#ifndef ZCONFIG_SPI_Avail__Win
-# define ZCONFIG_SPI_Avail__Win 0
+ #define ZCONFIG_SPI_Avail__Win 0
#endif
#ifndef ZCONFIG_SPI_Desired__Win
-# define ZCONFIG_SPI_Desired__Win 1
+ #define ZCONFIG_SPI_Desired__Win 1
#endif
// =================================================================================================
#pragma mark X11
//#ifndef ZCONFIG_SPI_Avail__X11
-//# define ZCONFIG_SPI_Avail__X11 (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
+// #define ZCONFIG_SPI_Avail__X11 (ZCONFIG_SPI_Avail__POSIX && ZCONFIG_SPI_Desired__POSIX)
//#endif
#ifndef ZCONFIG_SPI_Avail__X11
-# define ZCONFIG_SPI_Avail__X11 0
+ #define ZCONFIG_SPI_Avail__X11 0
#endif
#ifndef ZCONFIG_SPI_Desired__X11
-# define ZCONFIG_SPI_Desired__X11 1
+ #define ZCONFIG_SPI_Desired__X11 1
#endif
// =================================================================================================
#pragma mark zlib
#ifndef ZCONFIG_SPI_Avail__zlib
-# define ZCONFIG_SPI_Avail__zlib 0
+ #define ZCONFIG_SPI_Avail__zlib 0
#endif
#ifndef ZCONFIG_SPI_Desired__zlib
-# define ZCONFIG_SPI_Desired__zlib 1
+ #define ZCONFIG_SPI_Desired__zlib 1
#endif
Modified: trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCaller_CFRunLoop.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -28,17 +28,17 @@
// CFRunLoop is not available in CW's headers
#ifndef ZCONFIG_API_Avail__Caller_CFRunLoop
-# if ZCONFIG_SPI_Enabled(CoreFoundation) && !ZCONFIG(Compiler,CodeWarrior)
-# define ZCONFIG_API_Avail__Caller_CFRunLoop 1
-# endif
+ #if ZCONFIG_SPI_Enabled(CoreFoundation) && !ZCONFIG(Compiler,CodeWarrior)
+ #define ZCONFIG_API_Avail__Caller_CFRunLoop 1
+ #endif
#endif
#ifndef ZCONFIG_API_Avail__Caller_CFRunLoop
-# define ZCONFIG_API_Avail__Caller_CFRunLoop 0
+ #define ZCONFIG_API_Avail__Caller_CFRunLoop 0
#endif
#ifndef ZCONFIG_API_Desired__Caller_CFRunLoop
-# define ZCONFIG_API_Desired__Caller_CFRunLoop 1
+ #define ZCONFIG_API_Desired__Caller_CFRunLoop 1
#endif
#if ZCONFIG_API_Enabled(Caller_CFRunLoop)
Modified: trunk/zoolib/source/cxx/zoolib/ZCompare_T.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompare_T.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompare_T.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -100,4 +100,4 @@
} // namespace ZooLib
-#endif // __ZCompare_Vector_h__
+#endif // __ZCompare_T_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_Win.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -31,15 +31,15 @@
// If not otherwise specified, require Windows 2K.
#ifndef _WIN32_WINNT
-# define _WIN32_WINNT 0x0500
+ #define _WIN32_WINNT 0x0500
#endif
#ifndef NOMINMAX
-# define NOMINMAX
+ #define NOMINMAX
#endif
#ifndef STRICT
-# define STRICT
+ #define STRICT
#endif
// Recent windows headers conditionalize visibility of GetModuleHandleExW on
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_Xlib.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -26,9 +26,9 @@
#if ZCONFIG_SPI_Enabled(X11)
// Unfortunately, QuickDraw also defines Cursor. For the moment this lets us compile
// code that sees both QuickDraw and X11 headers. And don't get me started on BOOL ...
-# define Cursor ZooLib_X11_Cursor
-# include <X11/Xlib.h>
-# undef Cursor
+ #define Cursor ZooLib_X11_Cursor
+ #include <X11/Xlib.h>
+ #undef Cursor
#endif
#endif // __ZCompat_XLib_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_algorithm.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -23,9 +23,9 @@
#include "zconfig.h"
#if !defined(__MWERKS__) && defined(_MSC_VER) && (_MSC_VER < 1200)
-# include <algorithm.h>
+ #include <algorithm.h>
#else
-# include <algorithm>
+ #include <algorithm>
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZCompat_string.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZCompat_string.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZCompat_string.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -26,7 +26,7 @@
// strdup doesn't show up on older versions of CW
#if defined(__MWERKS__) && __MWERKS__ <= 0x2406
-# include <extras.h>
+ #include <extras.h>
#endif
#endif // __ZCompat_string_h__
Modified: trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZDCFont.cpp 2012-02-01 00:10:19 UTC (rev 2704)
@@ -30,7 +30,7 @@
#include "zoolib/ZUnicode.h"
#if ZCONFIG_SPI_Enabled(QuickDraw)
-# include ZMACINCLUDE3(ApplicationServices,QD,Fonts.h)
+ #include ZMACINCLUDE3(ApplicationServices,QD,Fonts.h)
#endif
namespace ZooLib {
Modified: trunk/zoolib/source/cxx/zoolib/ZDCFont.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZDCFont.h 2012-02-01 00:07:03 UTC (rev 2703)
+++ trunk/zoolib/source/cxx/zoolib/ZDCFont.h 2012-02-01 00:10:19 UTC (rev 2704)
@@ -27,11 +27,11 @@
#include "zoolib/ZUnicodeString.h"
#if ZCONFIG_SPI_Enabled(QuickDraw)
-# include ZMACINCLUDE3(Carbon,HIToolbox,TextEdit.h)
+ #include ZMACINCLUDE3(Carbon,HIToolbox,TextEdit.h)
#endif
#if ZCONFIG_SPI_Enabled(BeOS)
-# include <interface/Font.h>
+ #include <interface/Font.h>
#en...
[truncated message content] |
|
From: <ag...@us...> - 2012-02-01 18:21:08
|
Revision: 2707
http://zoolib.svn.sourceforge.net/zoolib/?rev=2707&view=rev
Author: agreen
Date: 2012-02-01 18:21:01 +0000 (Wed, 01 Feb 2012)
Log Message:
-----------
Fix some //## mistakes that came from moving away from #\t stuff.
Modified Paths:
--------------
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_Client.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -275,7 +275,7 @@
ZAssert(!req);
fOpen = false;
-//# #ZStreamerWriter::Wake();
+//## ZStreamerWriter::Wake();
return false;
}
@@ -306,7 +306,7 @@
void Device_Client::Stop()
{
fOpen = false;
-//# #ZStreamerWriter::Wake();
+//## ZStreamerWriter::Wake();
}
// =================================================================================================
@@ -347,7 +347,7 @@
fSendClose = true;
this->WakeWrite();
-//# #ZCommer::ReadFinished();
+//## ZCommer::ReadFinished();
}
bool Manager_Client::Commer_Changed::Read(const ZStreamR& r)
Modified: trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/blackberry/ZBlackBerry_OSXUSB.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -367,8 +367,8 @@
// Watcher fired, but could not create a USBDevice.
if (ZLOG(s, eNotice, "ZBlackBerry::Manager_OSXUSB"))
s << "Added, invoked with null device, PocketMac drivers installed?";
-//# #if (fPocketMacDriverInstalled)
-//# #fObserver->AddFailed();
+//## if (fPocketMacDriverInstalled)
+//## fObserver->AddFailed();
return;
}
Modified: trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/dataspace/ZDataspace_Source_DatonSet.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -278,7 +278,7 @@
s << "\nDatonSet Raw:\n" << iAdded->GetRel();
ZRef<ZRA::Expr_Rel> theRel = iAdded->GetRel();
-//# #theRel = ZQE::sTransform_Search(theRel);
+//## theRel = ZQE::sTransform_Search(theRel);
if (ZLOGPF(s, eDebug + 1))
s << "\nDatonSet Cooked:\n" << theRel;
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_FileRef.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -461,7 +461,7 @@
#elif defined(__PIWin__)
// Need to look at this again when we're doing 64 bit compiles.
-//# #ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
+//## ZAssertCompile(ZIntTrait_T<sizeof(size_t)>::eIs32Bit);
UseHandle useHandle(fHandle);
size_t handleSize = useHandle.Size();
Modified: trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp
===================================================================
--- trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/more/zoolib/photoshop/ZPhotoshop_Val.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -364,7 +364,7 @@
TypeID theType;
if (noErr != spPSActionList->GetType(iSource, x, &theType))
break;
-//# #COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
+//## COPYFROMTO(spPSActionList, iSource, x, theType, theDest)
}
}
return theDest;
Modified: trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZNodeRep_Overlay.h 2012-02-01 18:21:01 UTC (rev 2707)
@@ -52,7 +52,7 @@
virtual ZRef<ZNodeRep> CreateDir(Error* oError);
virtual ZRef<ZNodeRep> MoveTo(ZRef<ZNodeRep> iDest, Error* oError);
-//# #virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
+//## virtual ZRef<ZNodeRep> MoveFrom(ZRef<ZNodeRep> iSource, Error* oError);
virtual bool Delete(Error* oError);
virtual ZRef<ZStreamerR> OpenR(bool iPreventWriters, Error* oError);
Modified: trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZUtil_Mac_HL.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -587,8 +587,8 @@
if (inColorPixmap)
sAddPixmapToIconFamily(inColorPixmap, eData8, theIconFamilyHandle);
-//# #if (inColorPixmap)
-//# #sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
+//## if (inColorPixmap)
+//## sAddPixmapToIconFamily(inColorPixmap, eData32, theIconFamilyHandle);
if (inMonoPixmap)
sAddPixmapToIconFamily(inMonoPixmap, eData1, theIconFamilyHandle);
@@ -635,7 +635,7 @@
/* if (ZApp::sGet())
{
ZDCRgn theDCRgn;
-//# #ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
+//## ZApp::sGet()->AppleEventIdleProc(theEventRecord, sleepTime, theDCRgn);
::MacCopyRgn(theDCRgn, *outMouseRgn);
}*/
return false;
@@ -671,8 +671,8 @@
static ModalFilterUPP sModalFilterUPP = NewModalFilterUPP(ZUtil_Mac_HL::sModalFilter);
pascal Boolean ZUtil_Mac_HL::sModalFilter(DialogPtr theDialog, EventRecord* inOutEventRecord, short* inOutItemHit)
{
-//# #if (ZApp::sGet())
-//# #return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
+//## if (ZApp::sGet())
+//## return ZApp::sGet()->ModalFilter(theDialog, theEventRecord, itemHit);
return false;
}
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -76,7 +76,7 @@
"Vector",
"Type",
"Time",
-//# #"Name"
+//## "Name"
};
const char* ZTypeAsString(ZType iType)
@@ -1486,7 +1486,7 @@
case eZType_Rect: delete fData.fAs_Rect; break;
case eZType_String: sDtor_T<ValString>(fType.fBytes); break;
-//# #case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
+//## case eZType_Name: sDtor_T<ZTName>(fType.fBytes); break;
case eZType_Tuple: sDtor_T<ZMap_ZooLib>(fType.fBytes); break;
case eZType_RefCounted:
{
Modified: trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZVal_ZooLib.h 2012-02-01 18:21:01 UTC (rev 2707)
@@ -82,7 +82,7 @@
eZType_Vector = 18,
eZType_Type = 19,
eZType_Time = 20,
-//# #eZType_Name = 21
+//## eZType_Name = 21
eZType_Max
};
Modified: trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp
===================================================================
--- trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/old/zoolib/ZYad_ZooLibStrim.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -165,7 +165,7 @@
else if (typeValueLC == "id") oVal = eZType_ID;
else if (typeValueLC == "vector") oVal = eZType_Vector;
else if (typeValueLC == "type") oVal = eZType_Type;
-//# #else if (typeValueLC == "name") oVal = eZType_Name;
+//## else if (typeValueLC == "name") oVal = eZType_Name;
else
spThrowParseException("Unknown type name '" + typeValue + "'");
}
Modified: trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/zoolib/ZVal_Yad.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -29,9 +29,6 @@
ZAny ZVal_Yad::AsAny() const
{ return this->pAsAny(); }
-//##ZVal_Yad::operator operator_bool() const
-//# #{ return operator_bool_gen::translate(fYad); }
-
ZVal_Yad::ZVal_Yad()
{}
Modified: trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.cpp 2012-02-01 18:21:01 UTC (rev 2707)
@@ -78,7 +78,7 @@
}
//##ZRef<ZYadSeqRPos> ZYadSeqRPos_ApplyID::Clone()
-//# #{ return new ZYadSeqRPos_ApplyID(fYadSeqRPos->Clone(), fIDName, fValName); }
+///## { return new ZYadSeqRPos_ApplyID(fYadSeqRPos->Clone(), fIDName, fValName); }
uint64 ZYadSeqRPos_ApplyID::GetPosition()
{ return fYadSeqRPos->GetPosition(); }
Modified: trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h
===================================================================
--- trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h 2012-02-01 18:04:08 UTC (rev 2706)
+++ trunk/zoolib/source/cxx/zoolib/ZYadSeq_ApplyID.h 2012-02-01 18:21:01 UTC (rev 2707)
@@ -62,7 +62,7 @@
virtual ZRef<ZYadR> ReadInc();
// From ZYadSeqRPos
-//# #virtual ZRef<ZYadSeqRPos> Clone();
+//## virtual ZRef<ZYadSeqRPos> Clone();
virtual uint64 GetPosition();
virtual void SetPosition(uint64 iPosition);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X